chart2/source/controller/accessibility/AccessibleChartElement.hxx |
2 -
chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx |
5 ---
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx |
1
chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx |
2 -
chart2/source/controller/dialogs/DialogModel.hxx |
6 ----
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |
2 -
chart2/source/controller/dialogs/dlg_NumberFormat.hxx |
5 ---
chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |
3 --
chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx |
1
chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx |
1
chart2/source/controller/dialogs/tp_AxisLabel.hxx |
2 -
chart2/source/controller/dialogs/tp_PolarOptions.hxx |
1
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx |
1
chart2/source/controller/dialogs/tp_TitleRotation.hxx |
2 -
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |
1
chart2/source/controller/inc/AccessibleBase.hxx |
2 -
chart2/source/controller/inc/AccessibleChartView.hxx |
2 -
chart2/source/controller/inc/ChartController.hxx |
4 --
chart2/source/controller/inc/CommandDispatchContainer.hxx |
1
chart2/source/controller/inc/MultipleChartConverters.hxx |
1
chart2/source/controller/inc/ObjectHierarchy.hxx |
1
chart2/source/controller/inc/ObjectNameProvider.hxx |
3 --
chart2/source/controller/inc/PositionAndSizeHelper.hxx |
1
chart2/source/controller/inc/RegressionCurveItemConverter.hxx |
1
chart2/source/controller/inc/SeriesOptionsItemConverter.hxx |
2 -
chart2/source/controller/inc/StatisticsItemConverter.hxx |
1
chart2/source/controller/inc/TitleDialogData.hxx |
1
chart2/source/controller/inc/dlg_ChartType.hxx |
5 ---
chart2/source/controller/inc/dlg_ChartType_UNO.hxx |
1
chart2/source/controller/inc/dlg_CreationWizard.hxx |
4 --
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx |
3 --
chart2/source/controller/inc/dlg_DataEditor.hxx |
7 ----
chart2/source/controller/inc/dlg_DataSource.hxx |
2 -
chart2/source/controller/inc/dlg_InsertErrorBars.hxx |
5 ---
chart2/source/controller/inc/dlg_InsertLegend.hxx |
1
chart2/source/controller/inc/dlg_View3D.hxx |
5 ---
chart2/source/controller/inc/res_ErrorBar.hxx |
1
chart2/source/controller/inc/res_LegendPosition.hxx |
1
chart2/source/controller/main/ChartDropTargetHelper.hxx |
6 ----
chart2/source/controller/main/ChartModelClone.hxx |
1
chart2/source/controller/main/DragMethod_Base.hxx |
1
chart2/source/controller/main/StatusBarCommandDispatch.hxx |
2 -
chart2/source/controller/main/UndoActions.hxx |
2 -
chart2/source/controller/main/UndoCommandDispatch.hxx |
1
chart2/source/controller/main/UndoGuard.hxx |
1
chart2/source/controller/sidebar/ChartColorWrapper.hxx |
2 -
chart2/source/controller/sidebar/ChartLinePanel.hxx |
4 --
chart2/source/inc/AxisHelper.hxx |
6 ----
chart2/source/inc/ChangingResource.hxx |
1
chart2/source/inc/ChartModelHelper.hxx |
10 ------
chart2/source/inc/ChartTypeDialogController.hxx |
8 -----
chart2/source/inc/ChartTypeHelper.hxx |
3 --
chart2/source/inc/ChartTypeTemplate.hxx |
3 --
chart2/source/inc/ControllerLockGuard.hxx |
4 --
chart2/source/inc/DataBrowserModel.hxx |
6 ----
chart2/source/inc/DataInterpreter.hxx |
2 -
chart2/source/inc/DataSeriesHelper.hxx |
5 ---
chart2/source/inc/DataSource.hxx |
1
chart2/source/inc/DataSourceHelper.hxx |
3 --
chart2/source/inc/DiagramHelper.hxx |
15 ----------
chart2/source/inc/ExplicitCategoriesProvider.hxx |
2 -
chart2/source/inc/FormattedStringHelper.hxx |
1
chart2/source/inc/LegendHelper.hxx |
2 -
chart2/source/inc/ObjectIdentifier.hxx |
5 ---
chart2/source/inc/RangeHighlighter.hxx |
1
chart2/source/inc/RangeSelectionHelper.hxx |
1
chart2/source/inc/RangeSelectionListener.hxx |
4 --
chart2/source/inc/ReferenceSizeProvider.hxx |
1
chart2/source/inc/RegressionCurveHelper.hxx |
3 --
chart2/source/inc/StatisticsHelper.hxx |
2 -
chart2/source/inc/ThreeDHelper.hxx |
3 --
chart2/source/inc/TimerTriggeredControllerLock.hxx |
4 --
chart2/source/inc/TitleHelper.hxx |
2 -
chart2/source/inc/UncachedDataSequence.hxx |
1
chart2/source/inc/chartview/DataPointSymbolSupplier.hxx |
1
chart2/source/inc/chartview/DrawModelWrapper.hxx |
3 --
chart2/source/inc/chartview/ExplicitValueProvider.hxx |
8 -----
chart2/source/model/inc/XMLFilter.hxx |
3 --
chart2/source/model/main/GridProperties.cxx |
1
chart2/source/model/main/StockBar.cxx |
2 -
chart2/source/tools/InternalDataProvider.cxx |
2 -
chart2/source/view/axes/Tickmarks.hxx |
1
chart2/source/view/charttypes/Splines.hxx |
1
chart2/source/view/inc/LabelPositionHelper.hxx |
2 -
chart2/source/view/inc/PlotterBase.hxx |
3 --
chart2/source/view/inc/PlottingPositionHelper.hxx |
3 --
chart2/source/view/inc/ShapeFactory.hxx |
2 -
chart2/source/view/inc/VDataSeries.hxx |
3 --
chart2/source/view/inc/VDiagram.hxx |
6 ----
chart2/source/view/inc/VLegendSymbolFactory.hxx |
3 --
chart2/source/view/main/VButton.hxx |
3 --
chart2/source/view/main/VLegend.hxx |
5 ---
chart2/source/view/main/VTitle.hxx |
3 --
93 files changed, 264 deletions(-)
New commits:
commit 0489e8e21a072f05b6b4373e92c3f36e9c3e2594
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Fri Dec 20 22:18:11 2024 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Jan 2 08:24:07 2025 +0100
Drop unneeded forward declarations from chart2 module
test drive the new bin/find-unneeded-includes --fwdecl mode
Change-Id: I9fd1148e8cff3ebda4595820af5fc824f530245c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178967
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index e2a94bf69ff8..a307561943fa 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -22,8 +22,6 @@
#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
namespace com::sun::star::accessibility { class XAccessible; }
-namespace com::sun::star::accessibility { class XAccessibleContext; }
-namespace com::sun::star::awt { class XFont; }
namespace chart
{
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index 261f2686240a..96a38755f778 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -31,14 +31,9 @@
namespace chart { struct ExplicitIncrementData; }
namespace chart { struct ExplicitScaleData; }
namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2 { class XTitle; }
namespace com::sun::star::container { class XNameContainer; }
-namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::lang { class XUnoTunnel; }
namespace com::sun::star::uno { class XComponentContext; }
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 4c79bb25e9bb..52322dfe46c9 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -29,7 +29,6 @@
#include <rtl/ref.hxx>
#include <memory>
-namespace com::sun::star::chart2 { class XDataSeries; }
namespace chart { class DataSeries; }
namespace chart::wrapper
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 0eea39683474..61946ea5d75f 100644
---
a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++
b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -26,8 +26,6 @@
#include <utility>
#include <vector>
-namespace com::sun::star::chart2 { class XDataSeries; }
-
namespace chart::wrapper
{
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx
b/chart2/source/controller/dialogs/DialogModel.hxx
index 88a74c62d403..93a4ecf6455f 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -29,15 +29,10 @@
namespace chart { class ChartModel; }
namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::uno { template <class E> class Sequence; }
namespace com::sun::star::chart2 {
- class XDataSeriesContainer;
class XDataSeries;
- class XChartType;
namespace data {
class XDataProvider;
class XLabeledDataSequence;
@@ -49,7 +44,6 @@ namespace chart
class ChartType;
class DataSeries;
struct InterpretedData;
-class LabeledDataSequence;
class RangeSelectionHelper;
struct DialogModelTimeBasedInfo
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 0e95cd75c48e..50af5e4d0c69 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -24,8 +24,6 @@
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
-namespace com::sun::star::awt { class XWindow; }
-
namespace chart
{
using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
index be02edeb6257..2bb84696ac57 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx
@@ -20,11 +20,6 @@
#include <sfx2/basedlgs.hxx>
-namespace weld
-{
-class Window;
-class Container;
-}
class SfxItemSet;
class SfxItemPool;
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index f067bd2b0987..e599da2ee4a5 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -75,9 +75,6 @@
#include <utility>
#include <comphelper/diagnose_ex.hxx>
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 41366251729f..0f5d82d10f1d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -21,7 +21,6 @@
#include <vcl/weld.hxx>
namespace chart { class ControllerLockHelper; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index d0fc8a69d667..027070048501 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -22,7 +22,6 @@
#include <vcl/weld.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::beans { class XPropertySet; }
namespace chart { class ControllerLockHelper; }
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 75704ec4e4d5..f3062163e28c 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -28,8 +28,6 @@ namespace weld {
class CustomWeld;
class Label;
class RadioButton;
- class SpinButton;
- class ToggleButton;
}
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index eba4018052af..51ad7a809be0 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -25,7 +25,6 @@ namespace weld {
class CheckButton;
class CustomWeld;
class Frame;
- class SpinButton;
}
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 6b163f3c8815..48001d4fb7b8 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -24,7 +24,6 @@ namespace weld {
class CheckButton;
class MetricSpinButton;
class RadioButton;
- class ToggleButton;
class Widget;
}
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 9d59b693f9a8..559212ddf293 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -26,8 +26,6 @@ namespace weld {
class CheckButton;
class CustomWeld;
class Label;
- class SpinButton;
- class ToggleButton;
}
namespace chart
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index d2c30d8b4363..c63c885d1d4e 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -28,7 +28,6 @@
namespace chart { class LegendPositionResources; }
namespace chart { class TitleResources; }
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx
b/chart2/source/controller/inc/AccessibleBase.hxx
index 788de8cebcae..485381866d89 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -37,8 +37,6 @@
#include <memory>
namespace com::sun::star::awt { class XWindow; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::view { class XSelectionSupplier; }
class SdrView;
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx
b/chart2/source/controller/inc/AccessibleChartView.hxx
index 793cdd69ab77..f8fb6d302e9c 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -28,8 +28,6 @@
namespace com::sun::star::accessibility { class XAccessible; }
namespace com::sun::star::awt { class XWindow; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::view { class XSelectionSupplier; }
namespace accessibility
{
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index c882c185b3f8..a7815b76acae 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -43,7 +43,6 @@
#include <string_view>
namespace com::sun::star::accessibility { class XAccessible; }
-namespace com::sun::star::accessibility { class XAccessibleContext; }
namespace com::sun::star::awt { class XFocusListener; }
namespace com::sun::star::awt { class XKeyListener; }
namespace com::sun::star::awt { class XMouseListener; }
@@ -56,9 +55,7 @@ namespace com::sun::star::document { class XUndoManager; }
namespace com::sun::star::frame { class XDispatch; }
namespace com::sun::star::frame { class XLayoutManagerEventBroadcaster; }
namespace com::sun::star::graphic { class XGraphic; }
-namespace com::sun::star::lang { class XInitialization; }
namespace com::sun::star::uno { class XComponentContext; }
-namespace com::sun::star::util { class XCloseable; }
namespace com::sun::star::view { class XSelectionSupplier; }
class SdrModel;
@@ -87,7 +84,6 @@ class ChartWindow;
class DrawModelWrapper;
class DrawViewWrapper;
class ViewElementListProvider;
-class ViewElementListProvider;
class Diagram;
class AccessibleChartView;
class AccessibleTextHelper;
diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx
b/chart2/source/controller/inc/CommandDispatchContainer.hxx
index 34c80e7bf319..a7c6111a3f4c 100644
--- a/chart2/source/controller/inc/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx
@@ -26,7 +26,6 @@
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::frame { class XDispatch; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::frame { struct DispatchDescriptor; }
namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::util { struct URL; }
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx
b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 8fc9f33b4367..51b3f70e190a 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -23,7 +23,6 @@
#include <rtl/ref.hxx>
#include <optional>
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace chart { class ChartModel; }
class SdrModel;
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx
b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 1531866aaf2b..b0b303fbf770 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -24,7 +24,6 @@
#include <vector>
namespace com::sun::star::awt { struct KeyEvent; }
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace chart
{
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx
b/chart2/source/controller/inc/ObjectNameProvider.hxx
index c613dd5ce855..7035ba916081 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -22,9 +22,6 @@
#include <ObjectIdentifier.hxx>
#include <TitleHelper.hxx>
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::frame { class XModel; }
-
namespace chart
{
diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
index 0f79373d52f9..a8e25e33963e 100644
--- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
+++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
@@ -21,7 +21,6 @@
#include <ObjectIdentifier.hxx>
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::awt { struct Rectangle; }
namespace chart
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 8c4262b55ec5..cce795f9789d 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -21,7 +21,6 @@
#include "ItemConverter.hxx"
#include <rtl/ref.hxx>
-namespace com::sun::star::chart2 { class XRegressionCurveContainer; }
namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace chart { class DataSeries; }
class SdrModel;
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index b55457ac5b30..febccf806ccb 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -22,8 +22,6 @@
#include <com/sun/star/uno/Sequence.h>
#include <rtl/ref.hxx>
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart { class ChartModel; }
namespace chart { class BaseCoordinateSystem; }
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx
b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index a6c56a2691e7..7868a9014f7c 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -21,7 +21,6 @@
#include "ItemConverter.hxx"
#include <rtl/ref.hxx>
-namespace com::sun::star::frame { class XModel; }
namespace chart { class ChartModel; }
namespace chart::wrapper
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx
b/chart2/source/controller/inc/TitleDialogData.hxx
index 123ae9d6d65f..862eb8ad6193 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx
b/chart2/source/controller/inc/dlg_ChartType.hxx
index 02e6ac998bbc..427369e9a88e 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -21,11 +21,6 @@
#include <vcl/weld.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame
-{
-class XModel;
-}
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 4566ec75142d..ca79b25367de 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -22,7 +22,6 @@
#include <comphelper/proparrhlp.hxx>
#include <svtools/genericunodialog.hxx>
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::beans { class XPropertySetInfo; }
namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 556c1ca81bb3..1c5e3642e491 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -27,10 +27,6 @@
#include <memory>
-namespace com::sun::star::chart2
-{
-class XChartDocument;
-}
namespace com::sun::star::uno
{
class XComponentContext;
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 89b8cb5a08f2..68dbe78432da 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -33,11 +33,8 @@
#include <tools/link.hxx>
namespace com::sun::star::awt { class XWindow; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
-class VclWindowEvent;
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx
b/chart2/source/controller/inc/dlg_DataEditor.hxx
index 205e822a12a5..f7e335ac36fa 100644
--- a/chart2/source/controller/inc/dlg_DataEditor.hxx
+++ b/chart2/source/controller/inc/dlg_DataEditor.hxx
@@ -23,13 +23,6 @@
#include <rtl/ref.hxx>
namespace com::sun::star::uno { class XComponentContext; }
-namespace comphelper { template <class Tp, class Arg> class mem_fun1_t; }
-
-namespace com::sun::star {
- namespace chart2 {
- class XChartDocument;
- }
-}
namespace chart
{
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx
b/chart2/source/controller/inc/dlg_DataSource.hxx
index c6b10d1dd213..9da88e8de0ba 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -22,8 +22,6 @@
#include <vcl/weld.hxx>
#include <memory>
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::uno { class XComponentContext; }
class BuilderPage;
namespace chart
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 4f8e8d094a34..cdadc18c3f09 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -24,11 +24,6 @@
#include "res_ErrorBar.hxx"
-namespace com::sun::star::frame
-{
-class XModel;
-}
-
namespace chart
{
class ChartView;
diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx
b/chart2/source/controller/inc/dlg_InsertLegend.hxx
index 0e2cccc3809a..265f486f4a80 100644
--- a/chart2/source/controller/inc/dlg_InsertLegend.hxx
+++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx
@@ -25,7 +25,6 @@
#include "res_LegendPosition.hxx"
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
diff --git a/chart2/source/controller/inc/dlg_View3D.hxx
b/chart2/source/controller/inc/dlg_View3D.hxx
index 66c4a8eaf41a..1fda6745fbe1 100644
--- a/chart2/source/controller/inc/dlg_View3D.hxx
+++ b/chart2/source/controller/inc/dlg_View3D.hxx
@@ -21,11 +21,6 @@
#include <vcl/weld.hxx>
#include <ControllerLockGuard.hxx>
-namespace com::sun::star::frame
-{
-class XModel;
-}
-
namespace chart
{
class ThreeD_SceneGeometry_TabPage;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx
b/chart2/source/controller/inc/res_ErrorBar.hxx
index 2a1f3645a775..1f6ad006e637 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -25,7 +25,6 @@
#include <RangeSelectionListener.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace weld { class Builder; }
namespace weld { class Button; }
namespace weld { class CheckButton; }
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx
b/chart2/source/controller/inc/res_LegendPosition.hxx
index 80ccaa85da6e..32f065642051 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -22,7 +22,6 @@
#include <tools/link.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace weld { class Builder; }
namespace weld { class CheckButton; }
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx
b/chart2/source/controller/main/ChartDropTargetHelper.hxx
index ab573f1cd694..6a5383825836 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.hxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx
@@ -21,12 +21,6 @@
#include <vcl/transfer.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star {
- namespace chart2 {
- class XChartDocument;
- }
-}
-
namespace chart
{
class ChartModel;
diff --git a/chart2/source/controller/main/ChartModelClone.hxx
b/chart2/source/controller/main/ChartModelClone.hxx
index 41cf7fc10924..4f70132486b1 100644
--- a/chart2/source/controller/main/ChartModelClone.hxx
+++ b/chart2/source/controller/main/ChartModelClone.hxx
@@ -24,7 +24,6 @@
#include <rtl/ref.hxx>
namespace com::sun::star::chart2 { class XInternalDataProvider; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx
b/chart2/source/controller/main/DragMethod_Base.hxx
index 1a6593889066..df124406894c 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -23,7 +23,6 @@
#include <unotools/weakref.hxx>
namespace chart { class DrawViewWrapper; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index ae9dcaf4f67a..438952631206 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -24,8 +24,6 @@
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::util { class XModifiable; }
namespace com::sun::star::view { class XSelectionSupplier; }
namespace chart
diff --git a/chart2/source/controller/main/UndoActions.hxx
b/chart2/source/controller/main/UndoActions.hxx
index a86479e167ce..10fc0aeb5817 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -26,8 +26,6 @@
#include <memory>
-namespace com::sun::star::frame { class XModel; }
-
class SdrUndoAction;
namespace chart
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx
b/chart2/source/controller/main/UndoCommandDispatch.hxx
index f872387c761b..f09554103844 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -22,7 +22,6 @@
#include <rtl/ref.hxx>
namespace com::sun::star::document { class XUndoManager; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/controller/main/UndoGuard.hxx
b/chart2/source/controller/main/UndoGuard.hxx
index 90443a247af4..83938e86370a 100644
--- a/chart2/source/controller/main/UndoGuard.hxx
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -25,7 +25,6 @@
#include <memory>
namespace com::sun::star::document { class XUndoManager; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx
b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
index 70b3ce8fa47c..6405e694b475 100644
--- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx
+++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx
@@ -14,8 +14,6 @@
#include <sfx2/namedcolor.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame { class XModel; }
-namespace chart { class ChartModel; }
class SvxColorToolBoxControl;
class SvxLineStyleToolBoxControl;
diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx
b/chart2/source/controller/sidebar/ChartLinePanel.hxx
index ca3d8be14244..4449f3678fb6 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx
@@ -16,10 +16,6 @@
#include "ChartSidebarSelectionListener.hxx"
#include "ChartColorWrapper.hxx"
-class XLineDashItem;
-class XLineEndItem;
-class XLineStartItem;
-class XLineStyleItem;
class XLineTransparenceItem;
class XLineWidthItem;
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index f39e54c1fc00..0b96ddc03484 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -29,12 +29,6 @@
namespace chart { class ChartModel; }
namespace chart { class ExplicitCategoriesProvider; }
namespace chart { class ReferenceSizeProvider; }
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2 { class XScaling; }
namespace com::sun::star::uno { class XComponentContext; }
diff --git a/chart2/source/inc/ChangingResource.hxx
b/chart2/source/inc/ChangingResource.hxx
index bde5b0923400..dcb2aadbb974 100644
--- a/chart2/source/inc/ChangingResource.hxx
+++ b/chart2/source/inc/ChangingResource.hxx
@@ -21,7 +21,6 @@
namespace chart
{
-class ChangingResource;
class ResourceChangeListener
{
public:
diff --git a/chart2/source/inc/ChartModelHelper.hxx
b/chart2/source/inc/ChartModelHelper.hxx
index ec904ce8a7be..4694c35725d2 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -26,22 +26,12 @@
#include <vector>
namespace chart { class ChartModel; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
-namespace com::sun::star::chart2::data { class XDataProvider; }
-namespace com::sun::star::chart2::data { class XRangeHighlighter; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::view { class XSelectionSupplier; }
namespace chart
{
class BaseCoordinateSystem;
class ChartType;
class DataSeries;
-class Diagram;
class InternalDataProvider;
class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) ChartModelHelper
diff --git a/chart2/source/inc/ChartTypeDialogController.hxx
b/chart2/source/inc/ChartTypeDialogController.hxx
index 1d36a433d96a..d052f0d76e1c 100644
--- a/chart2/source/inc/ChartTypeDialogController.hxx
+++ b/chart2/source/inc/ChartTypeDialogController.hxx
@@ -33,14 +33,6 @@ namespace com::sun::star::beans
{
class XPropertySet;
}
-namespace com::sun::star::chart2
-{
-class XChartDocument;
-}
-namespace com::sun::star::lang
-{
-class XMultiServiceFactory;
-}
class ValueSet;
diff --git a/chart2/source/inc/ChartTypeHelper.hxx
b/chart2/source/inc/ChartTypeHelper.hxx
index 7366e4689773..8716ab9301ea 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -25,9 +25,6 @@
#include "ChartType.hxx"
#include <rtl/ref.hxx>
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-
namespace chart
{
class ChartType;
diff --git a/chart2/source/inc/ChartTypeTemplate.hxx
b/chart2/source/inc/ChartTypeTemplate.hxx
index ffd7cca26599..2bf0a880dbae 100644
--- a/chart2/source/inc/ChartTypeTemplate.hxx
+++ b/chart2/source/inc/ChartTypeTemplate.hxx
@@ -29,8 +29,6 @@
namespace com::sun::star::beans { struct PropertyValue; }
namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XCoordinateSystemContainer; }
namespace com::sun::star::chart2 { class XDataSeries; }
namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2::data { class XDataSource; }
@@ -43,7 +41,6 @@ class BaseCoordinateSystem;
class ChartType;
class DataSeries;
class Diagram;
-class LabeledDataSequence;
/** For creating diagrams and modifying existing diagrams. A base class that
implements XChartTypeTemplate and offers some tooling for classes that
diff --git a/chart2/source/inc/ControllerLockGuard.hxx
b/chart2/source/inc/ControllerLockGuard.hxx
index b9da29954a02..6de9212a0268 100644
--- a/chart2/source/inc/ControllerLockGuard.hxx
+++ b/chart2/source/inc/ControllerLockGuard.hxx
@@ -26,10 +26,6 @@ namespace chart
{
class ChartModel;
}
-namespace com::sun::star::frame
-{
-class XModel;
-}
namespace chart
{
diff --git a/chart2/source/inc/DataBrowserModel.hxx
b/chart2/source/inc/DataBrowserModel.hxx
index f5b2d80070ad..7608e7098ad6 100644
--- a/chart2/source/inc/DataBrowserModel.hxx
+++ b/chart2/source/inc/DataBrowserModel.hxx
@@ -28,12 +28,8 @@
#include <utility>
#include <vector>
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::uno { class XComponentContext; }
-
namespace com::sun::star::chart2 {
class XDataSeries;
- class XChartType;
}
namespace chart
@@ -41,8 +37,6 @@ namespace chart
class DialogModel;
class ChartModel;
-class ChartType;
-class DataSeries;
class OOO_DLLPUBLIC_CHARTTOOLS DataBrowserModel final
{
diff --git a/chart2/source/inc/DataInterpreter.hxx
b/chart2/source/inc/DataInterpreter.hxx
index 7638e5ccee3e..91513e25f31e 100644
--- a/chart2/source/inc/DataInterpreter.hxx
+++ b/chart2/source/inc/DataInterpreter.hxx
@@ -28,9 +28,7 @@
namespace chart
{
-class DataSeries;
class DataSource;
-class LabeledDataSequence;
/** offers tooling to interpret different data sources in a structural
and chart-type-dependent way.
diff --git a/chart2/source/inc/DataSeriesHelper.hxx
b/chart2/source/inc/DataSeriesHelper.hxx
index 2015398a7681..aeed0b152062 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -28,10 +28,6 @@
#include <vector>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
@@ -42,7 +38,6 @@ namespace chart { class ChartType; }
namespace chart { class DataSource; }
namespace chart { class Diagram; }
namespace chart { class DataSeries; }
-namespace chart { class LabeledDataSequence; }
namespace chart::DataSeriesHelper
{
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index 9b976e439a66..7e1b32340caf 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -28,7 +28,6 @@
namespace chart
{
-class LabeledDataSequence;
class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DataSource final : public
::cppu::WeakImplHelper<
diff --git a/chart2/source/inc/DataSourceHelper.hxx
b/chart2/source/inc/DataSourceHelper.hxx
index 7b08cafc22a7..37daf1e0bb93 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -27,12 +27,9 @@
namespace chart { class ChartModel; }
namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
-namespace com::sun::star::frame { class XModel; }
namespace chart
{
diff --git a/chart2/source/inc/DiagramHelper.hxx
b/chart2/source/inc/DiagramHelper.hxx
index eb9e4fd00792..986cbb9788ec 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -25,29 +25,14 @@
#include <rtl/ref.hxx>
namespace chart { class ChartModel; }
-namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDiagram; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
-namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-namespace com::sun::star::uno { class XComponentContext; }
namespace com::sun::star::util { class XNumberFormats; }
namespace com::sun::star::util { class XNumberFormatsSupplier; }
namespace chart
{
-class Axis;
class BaseCoordinateSystem;
class ChartType;
-class ChartTypeManager;
-class ChartTypeTemplate;
class DataSeries;
-class Diagram;
-class LabeledDataSequence;
class UNLESS_MERGELIBS(OOO_DLLPUBLIC_CHARTTOOLS) DiagramHelper
{
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx
b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 73bc258c9922..cffdcd5b1191 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -28,7 +28,6 @@
#include <vector>
namespace chart { class ChartModel; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
namespace com::sun::star::uno { class Any; }
@@ -36,7 +35,6 @@ namespace com::sun::star::uno { class Any; }
namespace chart
{
class BaseCoordinateSystem;
-class LabeledDataSequence;
struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory
{
diff --git a/chart2/source/inc/FormattedStringHelper.hxx
b/chart2/source/inc/FormattedStringHelper.hxx
index adc1f54802b8..31706b55ffc1 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -22,7 +22,6 @@
#include <rtl/ustring.hxx>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XFormattedString2; }
namespace com::sun::star::uno { template <class interface_type> class
Reference; }
namespace chart
diff --git a/chart2/source/inc/LegendHelper.hxx
b/chart2/source/inc/LegendHelper.hxx
index c46131bd2bc4..df7959a02fb2 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -24,8 +24,6 @@
#include "charttoolsdllapi.hxx"
namespace chart { class ChartModel; }
-namespace com::sun::star::chart2 { class XDiagram; }
-namespace com::sun::star::chart2 { class XLegend; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
diff --git a/chart2/source/inc/ObjectIdentifier.hxx
b/chart2/source/inc/ObjectIdentifier.hxx
index 5cfd6a1671b1..d72e4b132392 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -32,12 +32,7 @@ namespace chart { class ChartModel; }
namespace com::sun::star::awt { struct Point; }
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XInterface; }
namespace chart
diff --git a/chart2/source/inc/RangeHighlighter.hxx
b/chart2/source/inc/RangeHighlighter.hxx
index c7bcdd2c5c55..9ec39e9977ec 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -26,7 +26,6 @@
namespace com::sun::star {
namespace chart2 {
- class XDiagram;
class XDataSeries;
class XAxis;
}
diff --git a/chart2/source/inc/RangeSelectionHelper.hxx
b/chart2/source/inc/RangeSelectionHelper.hxx
index 3afc7fcb511a..5d6a0e60c8b5 100644
--- a/chart2/source/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/inc/RangeSelectionHelper.hxx
@@ -26,7 +26,6 @@
#include "charttoolsdllapi.hxx"
namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XChartDocument; }
namespace com::sun::star {
namespace sheet{
diff --git a/chart2/source/inc/RangeSelectionListener.hxx
b/chart2/source/inc/RangeSelectionListener.hxx
index 7902ff2263a4..345adaba5d4a 100644
--- a/chart2/source/inc/RangeSelectionListener.hxx
+++ b/chart2/source/inc/RangeSelectionListener.hxx
@@ -23,10 +23,6 @@
#include <com/sun/star/sheet/XRangeSelectionListener.hpp>
#include <rtl/ref.hxx>
-namespace com::sun::star::frame
-{
-class XModel;
-}
namespace weld
{
class DialogController;
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx
b/chart2/source/inc/ReferenceSizeProvider.hxx
index f3626b03d193..246712fdae25 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -28,7 +28,6 @@ namespace com::sun::star {
namespace chart2 {
class XTitle;
class XTitled;
- class XChartDocument;
}
namespace beans {
class XPropertySet;
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx
b/chart2/source/inc/RegressionCurveHelper.hxx
index fc0c2abcd5b7..481ac5bb3f69 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -26,13 +26,10 @@
#include <vector>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
namespace com::sun::star::chart2 { class XRegressionCurve; }
namespace com::sun::star::chart2 { class XRegressionCurveCalculator; }
namespace com::sun::star::chart2 { class XRegressionCurveContainer; }
namespace com::sun::star::chart2::data { class XDataSource; }
-namespace com::sun::star::frame { class XModel; }
namespace chart { class ChartModel; }
namespace chart { class DataSeries; }
namespace chart { class RegressionCurveModel; }
diff --git a/chart2/source/inc/StatisticsHelper.hxx
b/chart2/source/inc/StatisticsHelper.hxx
index f38a27ba500f..9c3d97c8b6ec 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -25,13 +25,11 @@
#include "charttoolsdllapi.hxx"
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XDataSeries; }
namespace com::sun::star::chart2::data { class XDataProvider; }
namespace com::sun::star::chart2::data { class XDataSequence; }
namespace com::sun::star::chart2::data { class XDataSource; }
namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
namespace com::sun::star::uno { template <typename > class Sequence; }
-namespace chart { class LabeledDataSequence; }
namespace chart { class DataSeries; }
namespace chart::StatisticsHelper
diff --git a/chart2/source/inc/ThreeDHelper.hxx
b/chart2/source/inc/ThreeDHelper.hxx
index 2c43fff6c71a..8a14c8fccf4d 100644
--- a/chart2/source/inc/ThreeDHelper.hxx
+++ b/chart2/source/inc/ThreeDHelper.hxx
@@ -24,9 +24,6 @@
#include <rtl/ref.hxx>
#include "charttoolsdllapi.hxx"
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XDiagram; }
-
namespace chart
{
class Diagram;
diff --git a/chart2/source/inc/TimerTriggeredControllerLock.hxx
b/chart2/source/inc/TimerTriggeredControllerLock.hxx
index 7d56fd94369e..df557d9af770 100644
--- a/chart2/source/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/inc/TimerTriggeredControllerLock.hxx
@@ -26,10 +26,6 @@
#include "charttoolsdllapi.hxx"
-namespace com::sun::star::frame
-{
-class XModel;
-}
namespace chart
{
class ControllerLockGuardUNO;
diff --git a/chart2/source/inc/TitleHelper.hxx
b/chart2/source/inc/TitleHelper.hxx
index f4ea2204d7d5..a2cf94f6cf0d 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -26,8 +26,6 @@
namespace chart { class ChartModel; }
namespace chart { class ReferenceSizeProvider; }
-namespace com::sun::star::chart2 { class XTitle; }
-namespace com::sun::star::frame { class XModel; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
diff --git a/chart2/source/inc/UncachedDataSequence.hxx
b/chart2/source/inc/UncachedDataSequence.hxx
index c134601944ff..5691413af528 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -37,7 +37,6 @@
#include <com/sun/star/util/XModifiable.hpp>
namespace com::sun::star::beans { class XPropertySetInfo; }
-namespace com::sun::star::chart2 { class XInternalDataProvider; }
namespace chart
{
diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
index 304b0f5a486f..d0701a167cc6 100644
--- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
+++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx
@@ -23,7 +23,6 @@
#include <rtl/ref.hxx>
#include <svx/unoshape.hxx>
-namespace com::sun::star::drawing { class XShapes; }
namespace com::sun::star::drawing { struct Direction3D; }
namespace chart
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx
b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 94ad117b87b0..931b2e6992e9 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -25,9 +25,6 @@
namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
class SdrObjList;
class SdrObject;
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index f4bc4aac874b..46fc979c4f2d 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -27,15 +27,7 @@
#include <memory>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XChartDocument; }
-namespace com::sun::star::chart2 { class XCoordinateSystem; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
-namespace com::sun::star::drawing { class XShape; }
-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;
diff --git a/chart2/source/model/inc/XMLFilter.hxx
b/chart2/source/model/inc/XMLFilter.hxx
index 941ea2c62134..d1eea04da653 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -36,9 +36,6 @@ namespace com::sun::star {
namespace embed {
class XStorage;
}
- namespace xml::sax {
- class XFastParser;
- }
namespace document {
class XGraphicStorageHandler;
}
diff --git a/chart2/source/model/main/GridProperties.cxx
b/chart2/source/model/main/GridProperties.cxx
index f308150f3b70..2c1cacf86cf3 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
-namespace com::sun::star::beans { class XPropertySetInfo; }
namespace com::sun::star::uno { class XComponentContext; }
using namespace ::com::sun::star;
diff --git a/chart2/source/model/main/StockBar.cxx
b/chart2/source/model/main/StockBar.cxx
index 5d7efdc5f0d9..0be153bb8059 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -26,8 +26,6 @@
#include <algorithm>
-namespace com::sun::star::beans { class XPropertySetInfo; }
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/InternalDataProvider.cxx
b/chart2/source/tools/InternalDataProvider.cxx
index 157c7cbca336..8046819d413b 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -47,8 +47,6 @@
#include <vector>
#include <algorithm>
-namespace com::sun::star::chart2 { class XChartDocument; }
-
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/view/axes/Tickmarks.hxx
b/chart2/source/view/axes/Tickmarks.hxx
index 2266c03c91d2..a983300effba 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -28,7 +28,6 @@
namespace chart { struct AxisProperties; }
namespace chart { struct TickmarkProperties; }
namespace com::sun::star::chart2 { class XScaling; }
-namespace com::sun::star::drawing { class XShape; }
namespace chart {
diff --git a/chart2/source/view/charttypes/Splines.hxx
b/chart2/source/view/charttypes/Splines.hxx
index b83c13931b47..500536d84ca4 100644
--- a/chart2/source/view/charttypes/Splines.hxx
+++ b/chart2/source/view/charttypes/Splines.hxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <vector>
-namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
namespace com::sun::star::drawing { struct Position3D; }
namespace chart
diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx
b/chart2/source/view/inc/LabelPositionHelper.hxx
index 4f2f3ba2797a..eacca4b6025d 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -26,9 +26,7 @@
#include <svx/unoshape.hxx>
namespace com::sun::star::drawing { struct Position3D; }
-namespace com::sun::star::drawing { class XShapes; }
namespace com::sun::star::awt { struct Size; }
-namespace com::sun::star::drawing { class XShape; }
namespace chart
{
diff --git a/chart2/source/view/inc/PlotterBase.hxx
b/chart2/source/view/inc/PlotterBase.hxx
index 73695507fd48..675370355baf 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -24,8 +24,6 @@
namespace com::sun::star::drawing { struct HomogenMatrix; }
namespace com::sun::star::drawing { struct Position3D; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace chart { struct ExplicitScaleData; }
@@ -33,7 +31,6 @@ namespace chart
{
class PlottingPositionHelper;
-class ShapeFactory;
/** This class provides methods for setting axis scales and for performing
* scene to screen transformations. It is used as the base class for all
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx
b/chart2/source/view/inc/PlottingPositionHelper.hxx
index ba2b6104bdc5..cd6753daac96 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -34,15 +34,12 @@
#include <rtl/ref.hxx>
#include <svx/unoshape.hxx>
-namespace com::sun::star::drawing { class XShapes; }
namespace com::sun::star::drawing { struct HomogenMatrix; }
namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
namespace chart
{
-class ShapeFactory;
-
/** allows the transformation of numeric values from one
coordinate-system into another. Values may be transformed using
any mapping.
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index b44612e74a4f..271b44b733bd 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -34,12 +34,10 @@ namespace chart { struct VLineProperties; }
namespace com::sun::star::beans { class XPropertySet; }
namespace com::sun::star::chart2 { class XFormattedString; }
namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
namespace com::sun::star::drawing { struct HomogenMatrix; }
namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
namespace com::sun::star::drawing { struct Position3D; }
namespace com::sun::star::graphic { class XGraphic; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::drawing { struct Direction3D; }
namespace chart
diff --git a/chart2/source/view/inc/VDataSeries.hxx
b/chart2/source/view/inc/VDataSeries.hxx
index 72f5fca80089..aeb7bd01cfc6 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -33,10 +33,7 @@
#include <map>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
namespace com::sun::star::chart2::data { class XDataSequence; }
-namespace com::sun::star::drawing { class XShapes; }
namespace chart
{
diff --git a/chart2/source/view/inc/VDiagram.hxx
b/chart2/source/view/inc/VDiagram.hxx
index 04f1a288317f..3b2d21336a03 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -25,16 +25,10 @@
#include <svx/unoshape.hxx>
#include <rtl/ref.hxx>
-namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::chart2 { class XDiagram; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
-namespace com::sun::star::drawing { class XShape; }
-
namespace chart
{
class Diagram;
-class ShapeFactory;
/** The VDiagram is responsible to generate the visible parts of the Diagram
that is wall, floor, axes and data series.
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx
b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index f637a5894912..055af7560338 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -25,9 +25,6 @@
namespace com::sun::star::awt { struct Size; }
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::uno { class Any; }
namespace chart::VLegendSymbolFactory
diff --git a/chart2/source/view/main/VButton.hxx
b/chart2/source/view/main/VButton.hxx
index 87017f36901a..f63851dd6443 100644
--- a/chart2/source/view/main/VButton.hxx
+++ b/chart2/source/view/main/VButton.hxx
@@ -17,9 +17,6 @@
#include <svx/unoshape.hxx>
namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace chart
{
diff --git a/chart2/source/view/main/VLegend.hxx
b/chart2/source/view/main/VLegend.hxx
index b6b6a0074e49..23eea74f5711 100644
--- a/chart2/source/view/main/VLegend.hxx
+++ b/chart2/source/view/main/VLegend.hxx
@@ -28,16 +28,11 @@
namespace chart { class ChartModel; }
namespace com::sun::star::awt { struct Rectangle; }
namespace com::sun::star::awt { struct Size; }
-namespace com::sun::star::chart2 { class XLegend; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
namespace com::sun::star::uno { class XComponentContext; }
namespace chart
{
-class Legend;
class LegendEntryProvider;
class VLegend
diff --git a/chart2/source/view/main/VTitle.hxx
b/chart2/source/view/main/VTitle.hxx
index 792d7f6a0a5c..957d322d2be6 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -27,9 +27,6 @@
namespace com::sun::star::awt { struct Point; }
namespace com::sun::star::chart2 { class XTitle; }
-namespace com::sun::star::drawing { class XShape; }
-namespace com::sun::star::drawing { class XShapes; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }
class SvxShapeText;
namespace chart
