[Libreoffice-commits] core.git: chart2/source

[Noel Grandin (via logerrit)]

 chart2/source/inc/DataInterpreter.hxx              |    3 ++-
 chart2/source/inc/DataSourceHelper.hxx             |    3 ++-
 chart2/source/model/template/ChartTypeTemplate.cxx |    3 ++-
 chart2/source/model/template/DataInterpreter.cxx   |    3 ++-
 chart2/source/tools/DataSourceHelper.cxx           |    2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit f90ac900a9ff48c4ea8ae797972ed4c442b516fb
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Feb 2 18:58:46 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Feb 4 12:22:31 2022 +0100

    use more concrete types in chart2, DataSource
    
    Change-Id: If5001a8a8fc1103a8d662429d3077c7ce81cc2b2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129457
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/chart2/source/inc/DataInterpreter.hxx 
b/chart2/source/inc/DataInterpreter.hxx
index d804f4e3eecb..a11e263a387a 100644
--- a/chart2/source/inc/DataInterpreter.hxx
+++ b/chart2/source/inc/DataInterpreter.hxx
@@ -30,6 +30,7 @@
 namespace chart
 {
 class DataSeries;
+class DataSource;
 class LabeledDataSequence;
 
 /** offers tooling to interpret different data sources in a structural
@@ -134,7 +135,7 @@ public:
         interpretDataSource()( <code>xSource</code> ),
         the result of this method should be <code>xSource</code>.</p>
      */
-    virtual css::uno::Reference< css::chart2::data::XDataSource > 
mergeInterpretedData(
+    virtual rtl::Reference< ::chart::DataSource > mergeInterpretedData(
         const InterpretedData& aInterpretedData );
 
     /** Get chart information that is specific to a particular chart
diff --git a/chart2/source/inc/DataSourceHelper.hxx 
b/chart2/source/inc/DataSourceHelper.hxx
index 35aefbd67a6a..561fb5644428 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -35,13 +35,14 @@ namespace com::sun::star::frame { class XModel; }
 
 namespace chart
 {
+class DataSource;
 class Diagram;
 class LabeledDataSequence;
 
 class OOO_DLLPUBLIC_CHARTTOOLS DataSourceHelper
 {
 public:
-        static css::uno::Reference< css::chart2::data::XDataSource >
+        static rtl::Reference< ::chart::DataSource >
             createDataSource( const css::uno::Sequence<
                 css::uno::Reference<  css::chart2::data::XLabeledDataSequence 
> > & rSequences );
 
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx 
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 0183907419ad..902c54ed6a89 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -23,6 +23,7 @@
 #include <ChartTypeHelper.hxx>
 #include <ChartType.hxx>
 #include <DataSeries.hxx>
+#include <DataSource.hxx>
 
 #include <AxisHelper.hxx>
 #include <Diagram.hxx>
@@ -203,7 +204,7 @@ void ChartTypeTemplate::changeDiagram( const 
rtl::Reference< Diagram >& xDiagram
         }
         else
         {
-            Reference< data::XDataSource > xSource( 
xInterpreter->mergeInterpretedData( aData ));
+            rtl::Reference< DataSource > xSource( 
xInterpreter->mergeInterpretedData( aData ));
             // todo: get a "range-union" from the data provider by calling
             // OUString aRange = getRangeRepresentationByData( xSource );
             // xSource.set( getDataByRangeRepresentation( aRange, aParam ));
diff --git a/chart2/source/model/template/DataInterpreter.cxx 
b/chart2/source/model/template/DataInterpreter.cxx
index 9461008c87ad..38d1ff5be1c1 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -19,6 +19,7 @@
 
 #include <DataInterpreter.hxx>
 #include <DataSeries.hxx>
+#include <DataSource.hxx>
 #include <DataSourceHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <CommonConverters.hxx>
@@ -327,7 +328,7 @@ private:
 
 } // anonymous namespace
 
-Reference< data::XDataSource > DataInterpreter::mergeInterpretedData(
+rtl::Reference< DataSource > DataInterpreter::mergeInterpretedData(
     const InterpretedData& aInterpretedData )
 {
     vector< Reference< data::XLabeledDataSequence > > aResultVec;
diff --git a/chart2/source/tools/DataSourceHelper.cxx 
b/chart2/source/tools/DataSourceHelper.cxx
index 33d613e6f25b..8fb6c8fa7ed8 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -118,7 +118,7 @@ void lcl_addErrorBarRanges(
 
 } // anonymous namespace
 
-Reference< chart2::data::XDataSource > DataSourceHelper::createDataSource(
+rtl::Reference< ::chart::DataSource > DataSourceHelper::createDataSource(
         const Sequence< Reference< chart2::data::XLabeledDataSequence > >& 
rSequences )
 {
     return new DataSource(rSequences);