1 files changed, 15 insertions, 13 deletions
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index f4d61154b04e..8fc9f33b4367 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -19,23 +19,25 @@
 #pragma once
 
 #include "MultipleItemConverter.hxx"
+#include <com/sun/star/awt/Size.hpp>
+#include <rtl/ref.hxx>
+#include <optional>
 
-namespace com::sun::star::awt { struct Size; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::lang { class XMultiServiceFactory; }
-
+namespace chart { class ChartModel; }
 class SdrModel;
 
 namespace chart::wrapper {
 
-class AllAxisItemConverter : public MultipleItemConverter
+class AllAxisItemConverter final : public MultipleItemConverter
 {
 public:
     AllAxisItemConverter(
-        const css::uno::Reference<css::frame::XModel> & xChartModel,
+        const rtl::Reference<::chart::ChartModel> & xChartModel,
         SfxItemPool& rItemPool,
         SdrModel& rDrawModel,
-        const css::awt::Size* pRefSize );
+        const std::optional<css::awt::Size>& pRefSize );
 
     virtual ~AllAxisItemConverter() override;
 
@@ -43,11 +45,11 @@ protected:
     virtual const WhichRangesContainer& GetWhichPairs() const override;
 };
 
-class AllGridItemConverter : public MultipleItemConverter
+class AllGridItemConverter final : public MultipleItemConverter
 {
 public:
     AllGridItemConverter(
-        const css::uno::Reference<css::frame::XModel>& xChartModel,
+        const rtl::Reference<::chart::ChartModel>& xChartModel,
         SfxItemPool& rItemPool,
         SdrModel& rDrawModel,
         const css::uno::Reference<css::lang::XMultiServiceFactory> & xNamedPropertyContainerFactory );
@@ -57,11 +59,11 @@ protected:
     virtual const WhichRangesContainer& GetWhichPairs() const override;
 };
 
-class AllDataLabelItemConverter : public MultipleItemConverter
+class AllDataLabelItemConverter final : public MultipleItemConverter
 {
 public:
     AllDataLabelItemConverter(
-        const css::uno::Reference<css::frame::XModel>& xChartModel,
+        const rtl::Reference<::chart::ChartModel>& xChartModel,
         SfxItemPool& rItemPool,
         SdrModel& rDrawModel,
         const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory );
@@ -72,11 +74,11 @@ protected:
     virtual const WhichRangesContainer& GetWhichPairs() const override;
 };
 
-class AllTitleItemConverter : public MultipleItemConverter
+class AllTitleItemConverter final : public MultipleItemConverter
 {
 public:
     AllTitleItemConverter(
-        const css::uno::Reference<css::frame::XModel>& xChartModel,
+        const rtl::Reference<::chart::ChartModel>& xChartModel,
         SfxItemPool& rItemPool, SdrModel& rDrawModel,
         const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory );
 
@@ -86,11 +88,11 @@ protected:
     virtual const WhichRangesContainer& GetWhichPairs() const override;
 };
 
-class AllSeriesStatisticsConverter : public MultipleItemConverter
+class AllSeriesStatisticsConverter final : public MultipleItemConverter
 {
 public:
     AllSeriesStatisticsConverter(
-        const css::uno::Reference<css::frame::XModel>& xChartModel, SfxItemPool& rItemPool );
+        const rtl::Reference<::chart::ChartModel>& xChartModel, SfxItemPool& rItemPool );
     virtual ~AllSeriesStatisticsConverter() override;
 
 protected: