RegressionCurveCalculator & co - com::sun::star -> css

Change-Id: I7cbf11009b5d7dbe2464288e696a1fcb1f3de3a0

7 files changed, 99 insertions, 95 deletions

diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index 0cf0f6c0fa0c..fd47f2e8518b 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 72b38f8db83d..30313ac678cb 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 ac2fd9c99151..6056b9978a85 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 80811daa6230..7ccfe489e011 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 20e50ca14b91..d05fa25a831a 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 514c3d0c7f2a..200463eeee5e 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 cb1c359fa44d..022263289d45 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;