From 540a54f59b49ee79a8db3cbcbfc184df5b8f433f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.co.uk>
Date: Mon, 18 Apr 2022 20:57:50 +0900
Subject: [PATCH] chart2: ExplicitValueProvider - make forward declrs.
 consistent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I90e8b2d163f700c7b1e251064af8655529f76906
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133126
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 chart2/inc/ChartView.hxx                             |  1 +
 .../source/inc/chartview/ExplicitValueProvider.hxx   | 12 +++++++-----
 chart2/source/view/main/ChartView.cxx                |  1 -
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 4d50c7693d4f..62a8d6744f0a 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -24,6 +24,7 @@
 
 #include <svl/lstner.hxx>
 #include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 3e599a0cf9ab..d97de84586a1 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -18,15 +18,12 @@
  */
 #pragma once
 
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <chartview/chartviewdllapi.hxx>
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 
 #include <memory>
 
-namespace chart { class ChartModel; }
-namespace chart { struct ExplicitIncrementData; }
-namespace chart { struct ExplicitScaleData; }
 namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::chart2 { class XAxis; }
 namespace com::sun::star::chart2 { class XChartDocument; }
@@ -38,12 +35,17 @@ namespace com::sun::star::uno { class XInterface; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 namespace com::sun::star::uno { template <typename > class Sequence; }
 namespace com::sun::star::util { class XNumberFormatsSupplier; }
+namespace com::sun::star::awt { struct Rectangle; }
 class SvxShape;
 
 namespace chart
 {
+
 class BaseCoordinateSystem;
 class DrawModelWrapper;
+class ChartModel;
+struct ExplicitIncrementData;
+struct ExplicitScaleData;
 
 class OOO_DLLPUBLIC_CHARTVIEW ExplicitValueProvider
 {
@@ -91,7 +93,7 @@ public:
             , const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
 
 protected:
-    ~ExplicitValueProvider() {}
+    ~ExplicitValueProvider() = default;
 };
 
 } //namespace chart
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 985f5ef1fc76..9b149872fbc7 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -76,7 +76,6 @@
 
 #include <time.h>
 
-#include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 #include <com/sun/star/chart/TimeUnit.hpp>