chart2/source/inc/ExponentialRegressionCurveCalculator.hxx | 33 +-
chart2/source/inc/LinearRegressionCurveCalculator.hxx | 12
chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx | 33 +-
chart2/source/inc/MeanValueRegressionCurveCalculator.hxx | 33 +-
chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx | 28 +-
chart2/source/inc/PolynomialRegressionCurveCalculator.hxx | 22 -
chart2/source/inc/PotentialRegressionCurveCalculator.hxx | 33 +-
chart2/source/inc/RegressionCurveHelper.hxx | 143 ++++-------
8 files changed, 151 insertions(+), 186 deletions(-)
New commits:
commit 7059c70d81b84001e4af6f832dbf74c32881a11d
Author: Tomaž Vajngerl <qui...@gmail.com>
Date: Sat Dec 14 19:09:42 2013 +0100
RegressionCurveCalculator & co - com::sun::star -> css
Change-Id: I7cbf11009b5d7dbe2464288e696a1fcb1f3de3a0
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index 0cf0f6c..fd47f2e 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -24,8 +24,7 @@
namespace chart
{
-class ExponentialRegressionCurveCalculator :
- public RegressionCurveCalculator
+class ExponentialRegressionCurveCalculator : public RegressionCurveCalculator
{
public:
ExponentialRegressionCurveCalculator();
@@ -33,27 +32,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter >& xNumFormatter,
- ::sal_Int32 nNumberFormatKey ) const;
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
+ sal_Int32 nNumberFormatKey ) const;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const ::com::sun::star::uno::Sequence< double >& aXValues,
- const ::com::sun::star::uno::Sequence< double >& aYValues )
- throw (::com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
+
virtual double SAL_CALL getCurveValue( double x )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
- ::sal_Int32 nPointCount,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingX,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingY,
- ::sal_Bool bMaySkipPointsInCalculation )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ sal_Int32 nPointCount,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
+ sal_Bool bMaySkipPointsInCalculation )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
// formula is: f(x) = exp(m_fLogIntercept) * exp( m_fLogSlope * x )
// mathematical model f(x) = Intercept * Slope^x
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index 72b38f8..30313ac 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -37,17 +37,17 @@ private:
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod)
- throw (com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence<
com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
sal_Int32 nPointCount,
- const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling
>& xScalingX,
- const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling
>& xScalingY,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
sal_Bool bMaySkipPointsInCalculation )
- throw (com::sun::star::lang::IllegalArgumentException,
- com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
};
} // namespace chart
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index ac2fd9c..6056b99 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -24,8 +24,7 @@
namespace chart
{
-class LogarithmicRegressionCurveCalculator :
- public RegressionCurveCalculator
+class LogarithmicRegressionCurveCalculator : public RegressionCurveCalculator
{
public:
LogarithmicRegressionCurveCalculator();
@@ -33,27 +32,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter >& xNumFormatter,
- ::sal_Int32 nNumberFormatKey ) const;
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
+ sal_Int32 nNumberFormatKey ) const;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const ::com::sun::star::uno::Sequence< double >& aXValues,
- const ::com::sun::star::uno::Sequence< double >& aYValues )
- throw (::com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
+
virtual double SAL_CALL getCurveValue( double x )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
- ::sal_Int32 nPointCount,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingX,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingY,
- ::sal_Bool bMaySkipPointsInCalculation )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ sal_Int32 nPointCount,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
+ sal_Bool bMaySkipPointsInCalculation )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
// formula is: f(x) = m_fSlope * log( x ) + m_fIntercept
double m_fSlope;
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 80811da..7ccfe48 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -24,8 +24,7 @@
namespace chart
{
-class MeanValueRegressionCurveCalculator :
- public RegressionCurveCalculator
+class MeanValueRegressionCurveCalculator : public RegressionCurveCalculator
{
public:
MeanValueRegressionCurveCalculator();
@@ -33,27 +32,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter >& xNumFormatter,
- ::sal_Int32 nNumberFormatKey ) const;
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
+ sal_Int32 nNumberFormatKey ) const;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const ::com::sun::star::uno::Sequence< double >& aXValues,
- const ::com::sun::star::uno::Sequence< double >& aYValues )
- throw (::com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
+
virtual double SAL_CALL getCurveValue( double x )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
- ::sal_Int32 nPointCount,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingX,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingY,
- ::sal_Bool bMaySkipPointsInCalculation )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ sal_Int32 nPointCount,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
+ sal_Bool bMaySkipPointsInCalculation )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
// formula is: f(x) = m_fMeanValue
double m_fMeanValue;
diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
index 20e50ca..d05fa25 100644
--- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
@@ -33,29 +33,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter >& xNumFormatter,
- ::sal_Int32 nNumberFormatKey ) const;
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
+ sal_Int32 nNumberFormatKey ) const;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const ::com::sun::star::uno::Sequence< double >& aXValues,
- const ::com::sun::star::uno::Sequence< double >& aYValues )
- throw (::com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
virtual double SAL_CALL getCurveValue( double x )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
- ::sal_Int32 nPointCount,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingX,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingY,
- ::sal_Bool bMaySkipPointsInCalculation )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ sal_Int32 nPointCount,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
+ sal_Bool bMaySkipPointsInCalculation )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
std::vector<double> aYList;
std::vector<double> aXList;
diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
index 514c3d0..200463e 100644
--- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
@@ -33,29 +33,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const com::sun::star::uno::Reference<
com::sun::star::util::XNumberFormatter >& xNumFormatter,
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
sal_Int32 nNumberFormatKey ) const;
virtual double SAL_CALL getCurveValue( double x )
- throw (com::sun::star::lang::IllegalArgumentException,
- com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const com::sun::star::uno::Sequence< double >& aXValues,
- const com::sun::star::uno::Sequence< double >& aYValues )
- throw (com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence<
com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
sal_Int32 nPointCount,
- const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling
>& xScalingX,
- const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling
>& xScalingY,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
sal_Bool bMaySkipPointsInCalculation )
- throw (com::sun::star::lang::IllegalArgumentException,
- com::sun::star::uno::RuntimeException);
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
std::vector<double> mCoefficients;
};
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index cb1c359..0222632 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -25,8 +25,7 @@
namespace chart
{
-class PotentialRegressionCurveCalculator :
- public RegressionCurveCalculator
+class PotentialRegressionCurveCalculator : public RegressionCurveCalculator
{
public:
PotentialRegressionCurveCalculator();
@@ -34,27 +33,29 @@ public:
protected:
virtual OUString ImplGetRepresentation(
- const ::com::sun::star::uno::Reference<
::com::sun::star::util::XNumberFormatter >& xNumFormatter,
- ::sal_Int32 nNumberFormatKey ) const;
+ const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
+ sal_Int32 nNumberFormatKey ) const;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
- const ::com::sun::star::uno::Sequence< double >& aXValues,
- const ::com::sun::star::uno::Sequence< double >& aYValues )
- throw (::com::sun::star::uno::RuntimeException);
+ const css::uno::Sequence<double>& aXValues,
+ const css::uno::Sequence<double>& aYValues )
+ throw (css::uno::RuntimeException);
+
virtual double SAL_CALL getCurveValue( double x )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence<
::com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
+
+ virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL
getCurveValues(
double min,
double max,
- ::sal_Int32 nPointCount,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingX,
- const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XScaling >& xScalingY,
- ::sal_Bool bMaySkipPointsInCalculation )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
+ sal_Int32 nPointCount,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingX,
+ const css::uno::Reference<css::chart2::XScaling>& xScalingY,
+ sal_Bool bMaySkipPointsInCalculation )
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException);
// formula is: f(x) = x ^ m_fSlope * m_fIntercept
double m_fSlope;
commit cd840e6a7e7a0ee2b735f2038bdd2de444dca5fa
Author: Tomaž Vajngerl <qui...@gmail.com>
Date: Thu Dec 12 20:12:53 2013 +0100
Make RegressionCurveHelper more readable (com::sun::star -> css)
Change-Id: I9b9e63a81bf5002413d18267b1000230f9ca7cdd
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx
b/chart2/source/inc/RegressionCurveHelper.hxx
index 58da00c..851eb8b 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -38,33 +38,24 @@ class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveHelper
{
public:
/// returns a model mean-value line
- SAL_DLLPRIVATE static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >
- createMeanValueLine(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext );
+ SAL_DLLPRIVATE static css::uno::Reference<css::chart2::XRegressionCurve>
+ createMeanValueLine(const
css::uno::Reference<css::uno::XComponentContext> & xContext );
/// returns a model regression curve
- SAL_DLLPRIVATE static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >
+ SAL_DLLPRIVATE static css::uno::Reference<css::chart2::XRegressionCurve>
createRegressionCurveByServiceName(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext,
+ const css::uno::Reference<css::uno::XComponentContext> & xContext,
OUString aServiceName );
static bool hasMeanValueLine(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer> &
xRegCnt );
static bool isMeanValueLine(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve > & xRegCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurve> & xRegCurve );
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >
+ static css::uno::Reference<css::chart2::XRegressionCurve>
getMeanValueLine(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveContainer > &
xRegCnt );
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer>
& xRegCnt );
/** creates a mean-value line and adds it to the container.
@@ -72,16 +63,12 @@ public:
If set, this property-set will be used to apply a line color
*/
static void addMeanValueLine(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & xContext,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & xSeriesProp );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegCnt,
+ const css::uno::Reference<css::uno::XComponentContext>& xContext,
+ const css::uno::Reference<css::beans::XPropertySet>& xSeriesProp );
static void removeMeanValueLine(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegCnt );
enum tRegressionType
{
@@ -99,68 +86,56 @@ public:
/** Returns the first regression curve found that is not of type
mean-value line
*/
- static
com::sun::star::uno::Reference<com::sun::star::chart2::XRegressionCurve >
+ static css::uno::Reference<com::sun::star::chart2::XRegressionCurve>
getFirstCurveNotMeanValueLine(
- const com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer >&
xCurveContainer );
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer );
/** Returns the regression curve found at the index provided.
*/
- static
com::sun::star::uno::Reference<com::sun::star::chart2::XRegressionCurve >
+ static css::uno::Reference<css::chart2::XRegressionCurve>
getRegressionCurveAtIndex(
- const
com::sun::star::uno::Reference<com::sun::star::chart2::XRegressionCurveContainer
>& xCurveContainer,
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer,
sal_Int32 aIndex);
/** Returns the type of the first regression curve found that is not of
type
mean-value line
*/
static tRegressionType getFirstRegressTypeNotMeanValueLine(
- const com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer >&
xCurveContainer );
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer );
static tRegressionType getRegressionType(
- const com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurve >& xCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
/** @param xPropertySource is taken as source to copy all properties from
if
not null
@param xEquationProperties is set at the new regression curve as
equation properties if not null
*/
- static com::sun::star::uno::Reference<
com::sun::star::chart2::XRegressionCurve >
+ static css::uno::Reference<css::chart2::XRegressionCurve>
addRegressionCurve(
tRegressionType eType,
- com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer >&
xCurveContainer,
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& xContext,
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet >& xPropertySource =
- com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet >(),
- const com::sun::star::uno::Reference<
- com::sun::star::beans::XPropertySet >& xEquationProperties =
- com::sun::star::uno::Reference<
com::sun::star::beans::XPropertySet >() );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer,
+ const css::uno::Reference<css::uno::XComponentContext>& xContext,
+ const css::uno::Reference<css::beans::XPropertySet >&
xPropertySource =
+ css::uno::Reference<css::beans::XPropertySet>(),
+ const css::uno::Reference<css::beans::XPropertySet>&
xEquationProperties =
+ css::uno::Reference<css::beans::XPropertySet>() );
static bool removeAllExceptMeanValueLine(
- com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer >&
xCurveContainer );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer );
static void removeEquations(
- com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer >&
xCurveContainer );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xCurveContainer );
- static com::sun::star::uno::Reference<
com::sun::star::chart2::XRegressionCurve >
+ static css::uno::Reference<css::chart2::XRegressionCurve>
changeRegressionCurveType(
tRegressionType eType,
- com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurveContainer > &
xRegressionCurveContainer,
- com::sun::star::uno::Reference<
- com::sun::star::chart2::XRegressionCurve > & xRegressionCurve,
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > & xContext );
+ css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xRegressionCurveContainer,
+ css::uno::Reference<css::chart2::XRegressionCurve>&
xRegressionCurve,
+ const css::uno::Reference<css::uno::XComponentContext>& xContext );
/// returns a calculator object for regression curves (used by the view)
- static com::sun::star::uno::Reference<
com::sun::star::chart2::XRegressionCurveCalculator >
+ static css::uno::Reference<css::chart2::XRegressionCurveCalculator>
createRegressionCurveCalculatorByServiceName( OUString aServiceName );
/** recalculates the regression parameters according to the data given in
@@ -179,10 +154,8 @@ public:
there is a data-sequence with role "values-x"
*/
SAL_DLLPRIVATE static void initializeCurveCalculator(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveCalculator > &
xOutCurveCalculator,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XDataSource > & xSource,
+ const css::uno::Reference<css::chart2::XRegressionCurveCalculator>&
xOutCurveCalculator,
+ const css::uno::Reference<css::chart2::data::XDataSource>& xSource,
bool bUseXValuesIfAvailable = true );
/** Same method as above, but uses the given XModel to determine the
@@ -191,55 +164,43 @@ public:
also changed.
*/
static void initializeCurveCalculator(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveCalculator > &
xOutCurveCalculator,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDataSeries > & xSeries,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel > & xModel );
+ const css::uno::Reference<css::chart2::XRegressionCurveCalculator>&
xOutCurveCalculator,
+ const css::uno::Reference<css::chart2::XDataSeries>& xSeries,
+ const css::uno::Reference<css::frame::XModel>& xModel );
- static OUString getUINameForRegressionCurve( const
::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >& xCurve );
+ static OUString getUINameForRegressionCurve(
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
static OUString getRegressionCurveName(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >& xCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
static OUString getRegressionCurveGenericName(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >& xCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
static OUString getRegressionCurveSpecificName(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve >& xCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
- static ::std::vector< ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve > >
getAllRegressionCurvesNotMeanValueLine(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram );
+ static std::vector<css::uno::Reference<css::chart2::XRegressionCurve> >
+ getAllRegressionCurvesNotMeanValueLine(
+ const css::uno::Reference<css::chart2::XDiagram>& xDiagram );
- static void resetEquationPosition( const ::com::sun::star::uno::Reference<
-
::com::sun::star::chart2::XRegressionCurve > & xCurve );
+ static void resetEquationPosition(
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
/// @return the index of the given curve in the given container. -1 if not
contained
static sal_Int32 getRegressionCurveIndex(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurveContainer > & xContainer,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve > & xCurve );
+ const css::uno::Reference<css::chart2::XRegressionCurveContainer>&
xContainer,
+ const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
- static bool hasEquation(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XRegressionCurve > & xCurve );
+ static bool hasEquation(const
css::uno::Reference<css::chart2::XRegressionCurve>& xCurve );
private:
- // not implemented
+ // instatiation not allowed
RegressionCurveHelper();
};
} // namespace chart
-// INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX
-#endif
+#endif // INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
