1 files changed, 19 insertions, 24 deletions

diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 2bd8d55faf00..24b74d6fab3a 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -21,6 +21,7 @@
 #include <TimerTriggeredControllerLock.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
+#include <ChartTypeTemplate.hxx>
 
 #include <map>
 #include <memory>
@@ -37,8 +38,6 @@ namespace com::sun::star::chart2 {
     class XDataSeriesContainer;
     class XDataSeries;
     class XChartType;
-    class XChartTypeTemplate;
-    struct InterpretedData;
     namespace data {
         class XDataProvider;
         class XLabeledDataSequence;
@@ -47,9 +46,11 @@ namespace com::sun::star::chart2 {
 
 namespace chart
 {
-
+class ChartType;
+class DataSeries;
+struct InterpretedData;
+class LabeledDataSequence;
 class RangeSelectionHelper;
-class ChartTypeTemplate;
 
 struct DialogModelTimeBasedInfo
 {
@@ -63,15 +64,13 @@ struct DialogModelTimeBasedInfo
 class DialogModel
 {
 public:
-    explicit DialogModel(
-        const rtl::Reference<::chart::ChartModel> & xChartDocument,
-        const css::uno::Reference< css::uno::XComponentContext > & xContext );
+    explicit DialogModel( rtl::Reference<::chart::ChartModel> xChartDocument );
     ~DialogModel();
 
     typedef std::pair<
                 OUString,
-                std::pair< css::uno::Reference< css::chart2::XDataSeries >,
-                             css::uno::Reference< css::chart2::XChartType > > >
+                std::pair< rtl::Reference< ::chart::DataSeries >,
+                             rtl::Reference< ::chart::ChartType > > >
         tSeriesWithChartTypeByName;
 
     typedef std::map< OUString, OUString >
@@ -89,7 +88,7 @@ public:
     css::uno::Reference< css::chart2::data::XDataProvider >
         getDataProvider() const;
 
-    std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > >
+    std::vector< rtl::Reference< ::chart::ChartType > >
         getAllDataSeriesContainers() const;
 
     std::vector< tSeriesWithChartTypeByName >
@@ -98,26 +97,26 @@ public:
     static tRolesWithRanges getRolesWithRanges(
         const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
         const OUString & aRoleOfSequenceForLabel,
-        const css::uno::Reference< css::chart2::XChartType > & xChartType );
+        const rtl::Reference< ::chart::ChartType > & xChartType );
 
     enum class MoveDirection
     {
         Down, Up
     };
 
-    void moveSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
+    void moveSeries( const rtl::Reference< DataSeries > & xSeries,
                      MoveDirection eDirection );
 
     /// @return the newly inserted series
-    css::uno::Reference<
-            css::chart2::XDataSeries > insertSeriesAfter(
+    rtl::Reference<
+            ::chart::DataSeries > insertSeriesAfter(
                 const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
-                const css::uno::Reference< css::chart2::XChartType > & xChartType,
+                const rtl::Reference< ::chart::ChartType > & xChartType,
                 bool bCreateDataCachedSequences = false );
 
     void deleteSeries(
-        const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
-        const css::uno::Reference< css::chart2::XChartType > & xChartType );
+        const rtl::Reference< ::chart::DataSeries > & xSeries,
+        const rtl::Reference< ::chart::ChartType > & xChartType );
 
     css::uno::Reference< css::chart2::data::XLabeledDataSequence >
         getCategories() const;
@@ -155,11 +154,7 @@ private:
     rtl::Reference<::chart::ChartModel>
         m_xChartDocument;
 
-    css::uno::Reference< css::chart2::XChartTypeTemplate >
-        m_xTemplate;
-
-    css::uno::Reference< css::uno::XComponentContext >
-        m_xContext;
+    rtl::Reference< ::chart::ChartTypeTemplate > m_xTemplate;
 
     mutable std::shared_ptr< RangeSelectionHelper >
         m_spRangeSelectionHelper;
@@ -168,8 +163,8 @@ private:
 
 private:
     void applyInterpretedData(
-        const css::chart2::InterpretedData & rNewData,
-        const std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse );
+        const InterpretedData & rNewData,
+        const std::vector< rtl::Reference< ::chart::DataSeries > > & rSeriesToReUse );
 
     sal_Int32 countSeries() const;