1 files changed, 6 insertions, 22 deletions
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 0186cf6419b9..8df0020431db 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -16,8 +16,7 @@
  *   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_SIDEBAR_CHARTTYPEPANEL_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTTYPEPANEL_HXX
+#pragma once
 
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 #include <sfx2/sidebar/SidebarModelUpdate.hxx>
@@ -28,19 +27,10 @@
 #include <ChartTypeTemplateProvider.hxx>
 #include <TimerTriggeredControllerLock.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace util
+namespace com::sun::star::util
 {
 class XModifyListener;
 }
-}
-}
-}
 
 namespace weld
 {
@@ -72,20 +62,16 @@ public:
     virtual void HandleContextChange(const vcl::EnumContext& rContext) override;
 
     // constructor/destructor
-    ChartTypePanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame,
-                   ::chart::ChartController* pController);
+    ChartTypePanel(weld::Widget* pParent, ::chart::ChartController* pController);
 
     virtual ~ChartTypePanel() override;
 
-    virtual void dispose() override;
-
     virtual void updateData() override;
     virtual void modelInvalid() override;
 
     virtual void updateModel(css::uno::Reference<css::frame::XModel> xModel) override;
 
-    virtual css::uno::Reference<css::chart2::XChartTypeTemplate>
-    getCurrentTemplate() const override;
+    virtual rtl::Reference<::chart::ChartTypeTemplate> getCurrentTemplate() const override;
 
 private:
     ChartTypeDialogController* getSelectedMainType();
@@ -103,12 +89,12 @@ private:
 
     vcl::EnumContext maContext;
 
-    css::uno::Reference<css::frame::XModel> mxModel;
     css::uno::Reference<css::util::XModifyListener> mxListener;
 
     bool mbModelValid;
 
     void Initialize();
+    void doUpdateModel(const rtl::Reference<::chart::ChartModel>& xModel);
 
     std::unique_ptr<Dim3DLookResourceGroup> m_pDim3DLookResourceGroup;
     std::unique_ptr<StackingResourceGroup> m_pStackingResourceGroup;
@@ -116,7 +102,7 @@ private:
     std::unique_ptr<GeometryResourceGroup> m_pGeometryResourceGroup;
     std::unique_ptr<SortByXValuesResourceGroup> m_pSortByXValuesResourceGroup;
 
-    css::uno::Reference<css::chart2::XChartDocument> m_xChartModel;
+    rtl::Reference<::chart::ChartModel> m_xChartModel;
 
     std::vector<std::unique_ptr<ChartTypeDialogController>> m_aChartTypeDialogControllerList;
     ChartTypeDialogController* m_pCurrentMainType;
@@ -132,6 +118,4 @@ private:
 }
 } // end of namespace ::chart::sidebar
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */