1 files changed, 11 insertions, 9 deletions
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index 7f42853d1088..c14ef82bd595 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -19,30 +19,34 @@
 #pragma once
 
 #include "ItemConverter.hxx"
+#include <com/sun/star/awt/Size.hpp>
+#include <rtl/ref.hxx>
 
+#include <optional>
 #include <vector>
 
-namespace com::sun::star::awt { struct Size; }
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::chart2 { class XAxis; }
 namespace com::sun::star::chart2 { class XChartDocument; }
+namespace chart { class Axis; }
 namespace chart { struct ExplicitIncrementData; }
 namespace chart { struct ExplicitScaleData; }
+namespace chart { class ChartModel; }
 
 class SdrModel;
 
 namespace chart::wrapper {
 
-class AxisItemConverter : public ItemConverter
+class AxisItemConverter final : public ItemConverter
 {
 public:
     AxisItemConverter(
         const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
         SfxItemPool& rItemPool, SdrModel& rDrawModel,
-        const css::uno::Reference<css::chart2::XChartDocument> & xChartDoc,
+        const rtl::Reference<::chart::ChartModel> & xChartDoc,
         ExplicitScaleData const * pScale,
         ExplicitIncrementData const * pIncrement,
-        const css::awt::Size* pRefSize );
+        const std::optional<css::awt::Size>& pRefSize );
 
     virtual ~AxisItemConverter() override;
 
@@ -50,7 +54,7 @@ public:
     virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) override;
 
 protected:
-    virtual const sal_uInt16 * GetWhichPairs() const override;
+    virtual const WhichRangesContainer& GetWhichPairs() const override;
     virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
 
     virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
@@ -58,11 +62,9 @@ protected:
 
 private:
     std::vector< std::unique_ptr<ItemConverter> >  m_aConverters;
-    css::uno::Reference<
-        css::chart2::XAxis >  m_xAxis;
+    rtl::Reference<::chart::Axis>  m_xAxis;
 
-    css::uno::Reference<
-        css::chart2::XChartDocument >      m_xChartDoc;
+    rtl::Reference<::chart::ChartModel>m_xChartDoc;
 
     std::unique_ptr<ExplicitScaleData>  m_pExplicitScale;
     std::unique_ptr<ExplicitIncrementData>  m_pExplicitIncrement;