1 files changed, 12 insertions, 13 deletions
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 88c2b3a274e2..720cc0fef2e7 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -16,39 +16,40 @@
  *   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_DATAPOINTITEMCONVERTER_HXX
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DATAPOINTITEMCONVERTER_HXX
+#pragma once
 
 #include "ItemConverter.hxx"
 #include "GraphicPropertyItemConverter.hxx"
+#include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/Sequence.h>
 
 #include <tools/color.hxx>
-
+#include <rtl/ref.hxx>
+#include <optional>
 #include <vector>
 
-namespace com::sun::star::awt { struct Size; }
 namespace com::sun::star::chart2 { class XDataSeries; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::uno { class XComponentContext; }
-
+namespace chart { class ChartModel; }
+namespace chart { class DataSeries; }
 class SdrModel;
 
 namespace chart::wrapper {
 
-class DataPointItemConverter : public ItemConverter
+class DataPointItemConverter final : public ItemConverter
 {
 public:
     DataPointItemConverter(
-        const css::uno::Reference<css::frame::XModel>& xChartModel,
+        const rtl::Reference<::chart::ChartModel>& xChartModel,
         const css::uno::Reference<css::uno::XComponentContext>& xContext,
         const css::uno::Reference<css::beans::XPropertySet>& rPropertySet,
-        const css::uno::Reference<css::chart2::XDataSeries>& xSeries,
+        const rtl::Reference<::chart::DataSeries>& xSeries,
         SfxItemPool& rItemPool,
         SdrModel& rDrawModel,
         const css::uno::Reference<css::lang::XMultiServiceFactory>& xNamedPropertyContainerFactory,
         GraphicObjectType eMapTo,
-        const css::awt::Size* pRefSize = nullptr,
+        const std::optional<css::awt::Size>& pRefSize = std::nullopt,
         bool bDataSeries = false,
         bool bUseSpecialFillColor = false,
         sal_Int32 nSpecialFillColor = 0,
@@ -63,7 +64,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;
@@ -81,11 +82,9 @@ private:
     bool                                m_bForbidPercentValue;
     bool                                m_bHideLegendEntry;
     sal_Int32                           m_nPointIndex;
-    css::uno::Reference<css::chart2::XDataSeries> m_xSeries;
+    rtl::Reference<::chart::DataSeries> m_xSeries;
 };
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */