1 files changed, 8 insertions, 16 deletions
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 7c804ba8a235..25b0367f8885 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -18,13 +18,11 @@
  */
 
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <dlg_DataSource.hxx>
 #include <ChartTypeTemplateProvider.hxx>
-#include <ChartTypeManager.hxx>
 #include <ChartTypeTemplate.hxx>
-#include <DiagramHelper.hxx>
+#include <Diagram.hxx>
 #include "DialogModel.hxx"
 #include <ChartModel.hxx>
 
@@ -32,11 +30,8 @@
 #include "tp_DataSource.hxx"
 
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
 using namespace ::chart;
 
-using ::com::sun::star::uno::Reference;
-
 namespace chart
 {
 
@@ -63,13 +58,11 @@ DocumentChartTypeTemplateProvider::DocumentChartTypeTemplateProvider(
     if( !xDoc.is())
         return;
 
-    Reference< chart2::XDiagram > xDia( xDoc->getFirstDiagram());
+    rtl::Reference< Diagram > xDia( xDoc->getFirstChartDiagram());
     if( xDia.is())
     {
-        DiagramHelper::tTemplateWithServiceName aResult(
-            DiagramHelper::getTemplateForDiagram(
-                xDia,
-                xDoc->getTypeManager() ));
+        Diagram::tTemplateWithServiceName aResult(
+            xDia->getTemplate( xDoc->getTypeManager() ));
         m_xTemplate = aResult.xChartTypeTemplate;
     }
 }
@@ -82,12 +75,11 @@ rtl::Reference< ::chart::ChartTypeTemplate > DocumentChartTypeTemplateProvider::
 sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
 
 DataSourceDialog::DataSourceDialog(weld::Window * pParent,
-    const rtl::Reference<::chart::ChartModel> & xChartDocument,
-    const Reference< uno::XComponentContext > & xContext)
+    const rtl::Reference<::chart::ChartModel> & xChartDocument)
     : GenericDialogController(pParent, "modules/schart/ui/datarangedialog.ui",
                               "DataRangeDialog")
     , m_apDocTemplateProvider(new DocumentChartTypeTemplateProvider(xChartDocument))
-    , m_apDialogModel(new DialogModel(xChartDocument, xContext))
+    , m_apDialogModel(new DialogModel(xChartDocument))
     , m_bRangeChooserTabIsValid(true)
     , m_bDataSourceTabIsValid(true)
     , m_bTogglingEnabled(true)
@@ -130,7 +122,7 @@ short DataSourceDialog::run()
     return nResult;
 }
 
-IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OUString&, rPage, void)
 {
     if (rPage == "range")
         m_xRangeChooserTabPage->Activate();
@@ -139,7 +131,7 @@ IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void)
 }
 
 // allow/disallow user to leave page
-IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OString&, bool)
+IMPL_LINK_NOARG(DataSourceDialog, DeactivatePageHdl, const OUString&, bool)
 {
     return m_bTogglingEnabled;
 }