1 files changed, 10 insertions, 21 deletions
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 272fe1a81813..9da88e8de0ba 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -16,27 +16,21 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
-
-#include <vcl/weld.hxx>
+#pragma once
 
 #include "TabPageNotifiable.hxx"
-
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::uno { class XComponentContext; }
-
+#include <vcl/weld.hxx>
 #include <memory>
 
 class BuilderPage;
 
 namespace chart
 {
-
-class RangeChooserTabPage;
-class DataSourceTabPage;
+class ChartModel;
 class ChartTypeTemplateProvider;
+class DataSourceTabPage;
 class DialogModel;
+class RangeChooserTabPage;
 
 class DataSourceDialog final :
         public weld::GenericDialogController,
@@ -45,20 +39,18 @@ class DataSourceDialog final :
 public:
     explicit DataSourceDialog(
         weld::Window * pParent,
-        const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument,
-        const css::uno::Reference< css::uno::XComponentContext > & xContext );
+        const rtl::Reference<::chart::ChartModel> & xChartDocument );
     virtual ~DataSourceDialog() override;
 
-    // from GenericDialogController base
-    virtual short run() override;
-
     // TabPageNotifiable
     virtual void setInvalidPage( BuilderPage * pTabPage ) override;
     virtual void setValidPage( BuilderPage * pTabPage ) override;
 
 private:
-    DECL_LINK(ActivatePageHdl, const OString&, void);
-    DECL_LINK(DeactivatePageHdl, const OString&, bool);
+    DECL_LINK(ActivatePageHdl, const OUString&, void);
+    DECL_LINK(DeactivatePageHdl, const OUString&, bool);
+    DECL_LINK(OkHdl, weld::Button&, void);
+    void commitPages();
 
     std::unique_ptr< ChartTypeTemplateProvider >  m_apDocTemplateProvider;
     std::unique_ptr< DialogModel >                m_apDialogModel;
@@ -77,7 +69,4 @@ private:
 
 } //  namespace chart
 
-// INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */