tdf#146619 Run IWYU on chart2/

Change-Id: I2f0920df37ba14918e1325983309f9b77c8792cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188751 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
2025-08-18 20:19:39 +02:00
parent 9ae1e92464
commit 85f88d7196
181 changed files with 13 additions and 378 deletions
@@ -347,6 +347,9 @@ excludelist:
    chart2/source/tools/WrappedProperty.cxx:
    # Actually used
    - com/sun/star/beans/XPropertyState.hpp
+    chart2/source/tools/WrappedDefaultProperty.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertyState.hpp
    chart2/source/view/inc/VLineProperties.hxx:
    # base class has to be a complete type
    - com/sun/star/uno/Reference.h
@@ -449,12 +452,6 @@ excludelist:
    chart2/source/controller/inc/ItemPropertyMap.hxx:
    # base class has to be a complete type
    - map
-    chart2/source/controller/inc/RangeSelectionHelper.hxx:
-    # base class has to be a complete type
-    - com/sun/star/uno/Sequence.h
-    chart2/source/controller/inc/RangeSelectionListener.hxx:
-    # base class has to be a complete type
-    - com/sun/star/sheet/XRangeSelectionListener.hpp
    chart2/source/controller/accessibility/AccessibleChartShape.hxx:
    # base class has to be a complete type
    - AccessibleBase.hxx
@@ -557,15 +554,6 @@ excludelist:
    chart2/source/controller/main/ChartFrameloader.cxx:
    # Actually used
    - com/sun/star/uno/XComponentContext.hpp
-    chart2/source/controller/main/CommandDispatch.hxx:
-    # base class has to be a complete type
-    - com/sun/star/frame/XDispatch.hpp
-    - com/sun/star/util/XModifyListener.hpp
-    - comphelper/interfacecontainer2.hxx
-    chart2/source/controller/main/ControllerCommandDispatch.hxx:
-    # base class has to be a complete type
-    - CommandDispatch.hxx
-    - com/sun/star/view/XSelectionChangeListener.hpp
    chart2/source/controller/main/ElementSelector.hxx:
    # base class has to be a complete type
    - com/sun/star/lang/XServiceInfo.hpp
@@ -66,7 +66,6 @@ namespace com::sun::star::document { class XFilter; }
 namespace com::sun::star::embed { class XStorage; }
 namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::uno { class XComponentContext; }
-namespace com::sun::star::uno { class XAggregation; }

 class SvNumberFormatter;
 class SvNumberFormatsSupplierObj;
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -43,8 +43,6 @@

 #include <vcl/timer.hxx>

-namespace com::sun::star::drawing { class XDrawPage; }
-namespace com::sun::star::drawing { class XShapes; }
 namespace com::sun::star::io { class XOutputStream; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::util { class XUpdatable2; }
@@ -33,9 +33,7 @@
 #include <sal/log.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
-#include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/functional.hxx>
@@ -19,15 +19,12 @@

 #include "AccessibleChartElement.hxx"
 #include <AccessibleTextHelper.hxx>
-#include <CharacterProperties.hxx>
 #include <ChartModel.hxx>
 #include <ChartController.hxx>
 #include <ObjectIdentifier.hxx>
 #include <ObjectNameProvider.hxx>

-#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>

 using namespace ::com::sun::star;
@@ -20,8 +20,6 @@

 #include <AccessibleBase.hxx>

-namespace com::sun::star::accessibility { class XAccessible; }
-
 namespace chart
 {
 class AccessibleTextHelper;
@@ -19,8 +19,6 @@

 #include "AccessibleChartShape.hxx"

-#include <com/sun/star/awt/XWindow.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
@@ -20,7 +20,6 @@

 #include <AccessibleBase.hxx>

-#include <cppuhelper/implbase.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>

 namespace accessibility
@@ -33,7 +33,6 @@

 #include <rtl/ustring.hxx>
 #include <vcl/window.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>

@@ -28,10 +28,8 @@

 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshtxt.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>

-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <osl/diagnose.h>

@@ -21,7 +21,6 @@
 #include <Legend.hxx>
 #include <LegendHelper.hxx>
 #include <CommonConverters.hxx>
-#include <servicenames.hxx>
 #include <ObjectIdentifier.hxx>
 #include <chartview/DrawModelWrapper.hxx>
 #include <Axis.hxx>
@@ -32,7 +31,6 @@

 #include <ChartModel.hxx>

-#include <com/sun/star/chart2/XDataSeries.hpp>
 #include <comphelper/diagnose_ex.hxx>

 using namespace ::com::sun::star;
@@ -31,7 +31,6 @@
 namespace chart { struct ExplicitIncrementData; }
 namespace chart { struct ExplicitScaleData; }
 namespace com::sun::star::chart2 { class XAxis; }
-namespace com::sun::star::chart2 { class XDataSeries; }
 namespace com::sun::star::chart2 { class XTitle; }
 namespace com::sun::star::container { class XNameContainer; }
 namespace com::sun::star::uno { class XComponentContext; }
@@ -39,7 +38,6 @@ namespace com::sun::star::uno { class XComponentContext; }

 namespace chart
 {
-class ExplicitValueProvider;
 class ChartModel;

 namespace wrapper
@@ -26,7 +26,6 @@
 #include <com/sun/star/chart/XDateCategories.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/EventObject.hpp>

 #include <memory>

@@ -20,8 +20,6 @@
 #include "DataSeriesPointWrapper.hxx"
 #include "Chart2ModelContact.hxx"
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
-#include <DiagramHelper.hxx>
 #include <DataSeries.hxx>
 #include <DataSeriesProperties.hxx>
 #include <LinePropertiesHelper.hxx>
@@ -37,7 +37,6 @@
 #include <rtl/ref.hxx>
 #include <memory>

-namespace com::sun::star::chart2 { class XDiagram; }
 namespace com::sun::star::lang { class XEventListener; }
 namespace chart { class Diagram; }

@@ -22,7 +22,6 @@
 #include <string_view>

 #include "WrappedAxisAndGridExistenceProperties.hxx"
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
 #include <WrappedProperty.hxx>
@@ -28,7 +28,6 @@

 #include <com/sun/star/chart2/CurveStyle.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <utility>

 using namespace ::com::sun::star;
@@ -21,7 +21,6 @@
 #include "WrappedSeriesOrDiagramProperty.hxx"
 #include <FastPropertyIdRanges.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/chart2/SymbolStyle.hpp>
 #include <com/sun/star/awt/Size.hpp>
@@ -19,8 +19,6 @@

 #include "WrappedTextRotationProperty.hxx"

-namespace com::sun::star::beans { class XPropertyState; }
-
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;

@@ -29,15 +29,8 @@ namespace com::sun::star {
    namespace awt {
        class XWindow;
    }
-    namespace chart2 {
-        class XChartDocument;
-    }
 }

-namespace com::sun::star::uno { class XComponentContext; }
-
-class OutputDevice;
-
 namespace chart
 {

@@ -21,7 +21,6 @@
 #include <DataBrowserModel.hxx>
 #include <ChartType.hxx>
 #include <ChartTypeManager.hxx>
-#include <ChartView.hxx>
 #include <Diagram.hxx>
 #include <DataSeries.hxx>
 #include <DataSeriesHelper.hxx>
@@ -28,7 +28,6 @@
 #include <ResId.hxx>
 #include <ControllerLockGuard.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ChartTypeTemplate.hxx>
 #include <ThreeDHelper.hxx>
 #include <ChartModel.hxx>
@@ -24,8 +24,6 @@

 namespace chart
 {
-using namespace ::com::sun::star;
-
 TimerTriggeredControllerLock::TimerTriggeredControllerLock(
    rtl::Reference<::chart::ChartModel> xModel)
    : m_xModel(std::move(xModel))
@@ -24,8 +24,6 @@

 namespace chart
 {
-using namespace ::com::sun::star;
-
 ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
                                 rtl::Reference<::chart::ChartModel> xChartModel)
    : GenericDialogController(pParent, u"modules/schart/ui/charttypedialog.ui"_ustr,
@@ -20,7 +20,6 @@
 #include <dlg_ChartType_UNO.hxx>
 #include <dlg_ChartType.hxx>
 #include <ChartModel.hxx>
-#include <servicenames.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>

@@ -20,7 +20,6 @@
 #include <dlg_CreationWizard_UNO.hxx>
 #include <dlg_CreationWizard.hxx>
 #include <ChartModel.hxx>
-#include <servicenames.hxx>
 #include <TimerTriggeredControllerLock.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
@@ -17,8 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <com/sun/star/chart2/XChartDocument.hpp>
-
 #include <dlg_DataSource.hxx>
 #include <ChartTypeTemplateProvider.hxx>
 #include <ChartTypeTemplate.hxx>
@@ -29,7 +27,6 @@
 #include "tp_RangeChooser.hxx"
 #include "tp_DataSource.hxx"

-using namespace ::com::sun::star;
 using namespace ::chart;

 namespace chart
@@ -30,7 +30,6 @@
 #include <DataSeries.hxx>

 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;

 namespace chart
 {
@@ -27,8 +27,6 @@

 namespace chart
 {
-using namespace ::com::sun::star;
-
 NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, const SfxItemSet& rSet)
    : SfxSingleTabDialogController(pParent, &rSet, u"cui/ui/formatnumberdialog.ui"_ustr, u"FormatNumberDialog"_ustr)
    , m_xContent( m_xBuilder->weld_container(u"content"_ustr) )
@@ -53,7 +53,6 @@
 #include <BaseCoordinateSystem.hxx>

 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 #include <svl/intitem.hxx>
 #include <svl/ctloptions.hxx>

@@ -28,8 +28,6 @@

 #include <vcl/tabs.hrc>

-using namespace ::com::sun::star;
-
 namespace chart
 {

@@ -24,7 +24,6 @@
 #include <chartview/ChartSfxItemIds.hxx>
 #include <vcl/weld.hxx>
 #include <ChartModel.hxx>
-#include "DialogModel.hxx"

 #include <rtl/math.hxx>
 #include <comphelper/diagnose_ex.hxx>
@@ -21,7 +21,6 @@

 #include <Diagram.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
 #include <ControllerLockGuard.hxx>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
@@ -37,7 +37,6 @@
 namespace chart
 {
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;

 ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogController* pController, rtl::Reference<::chart::ChartModel> xChartModel,
                                   bool bShowDescription)
@@ -27,7 +27,6 @@

 #include <vcl/wizardmachine.hxx>

-namespace com::sun::star::chart2 { class XChartDocument; }
 namespace weld { class CustomWeld; }

 class ValueSet;
@@ -25,16 +25,11 @@

 #include <RangeSelectionListener.hxx>

-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-
 namespace chart { class TabPageNotifiable; }

 namespace chart
 {
-class ChartType;
 class ChartTypeTemplateProvider;
-class DataSeries;
 class DialogModel;

 class SeriesEntry
@@ -19,8 +19,6 @@

 #include "tp_ErrorBars.hxx"

-using namespace ::com::sun::star;
-
 namespace chart
 {

@@ -29,7 +29,6 @@
 namespace chart
 {
 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;

 TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController,
                                                 rtl::Reference<::chart::ChartModel> xChartModel,
@@ -24,8 +24,6 @@
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <comphelper/OAccessible.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
 #include <tools/color.hxx>
 #include <unotools/weakref.hxx>
 #include <vcl/window.hxx>
@@ -34,9 +32,6 @@
 #include <vector>
 #include <memory>

-namespace com::sun::star::awt { class XWindow; }
-
-
 class SdrView;

 namespace accessibility
@@ -23,7 +23,6 @@
 #include <svx/AccessibleTextHelper.hxx>
 #include <vcl/window.hxx>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/awt/XWindow.hpp>


 namespace chart
@@ -26,8 +26,6 @@
 #include <vector>

 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; }
@@ -43,14 +43,7 @@
 #include <memory>
 #include <string_view>

-namespace com::sun::star::accessibility { class XAccessible; }
-namespace com::sun::star::awt { class XFocusListener; }
-namespace com::sun::star::awt { class XKeyListener; }
-namespace com::sun::star::awt { class XMouseListener; }
-namespace com::sun::star::awt { class XMouseMotionListener; }
-namespace com::sun::star::awt { class XPaintListener; }
 namespace com::sun::star::awt { class XWindow; }
-namespace com::sun::star::awt { class XWindowListener; }
 namespace com::sun::star::awt { struct Point; }
 namespace com::sun::star::document { class XUndoManager; }
 namespace com::sun::star::frame { class XDispatch; }
@@ -17,7 +17,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>

-namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::frame { class XFramesSupplier; }

 namespace chart {
@@ -28,8 +28,6 @@
 #include <optional>
 #include <vector>

-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; }
@@ -13,10 +13,6 @@
 #include <rtl/ref.hxx>
 #include <vector>

-namespace com::sun::star::awt
-{
-struct Size;
-}
 namespace com::sun::star::beans
 {
 class XPropertySet;
@@ -23,7 +23,6 @@
 #include <rtl/ref.hxx>

 namespace com::sun::star::frame { class XModel; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }

 class SdrModel;
 namespace chart { class ChartModel; }
@@ -22,8 +22,6 @@

 #include <rtl/ref.hxx>

-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
 class SdrModel;

 namespace chart { class ChartModel; }
@@ -24,8 +24,6 @@
 #include <optional>
 #include <vector>

-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
 class SdrModel;
 namespace chart { class ChartModel; }

@@ -23,7 +23,6 @@
 #include <rtl/ref.hxx>
 #include <optional>

-namespace com::sun::star::lang { class XMultiServiceFactory; }
 namespace chart { class ChartModel; }
 class SdrModel;

@@ -21,7 +21,7 @@
 #include "ItemConverter.hxx"
 #include <rtl/ref.hxx>

-namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace chart { class ChartModel; }
 namespace chart { class DataSeries; }
 class SdrModel;

@@ -25,7 +25,6 @@
 #include <vector>

 namespace com::sun::star::beans { class XPropertySet; }
-namespace com::sun::star::lang { class XMultiServiceFactory; }

 class SdrModel;
 namespace chart { class ChartModel; }
@@ -26,8 +26,6 @@
 #include <optional>
 #include <vector>

-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::frame { class XModel; }
 namespace chart { class ChartModel; }
 namespace chart { class DataSeries; }

@@ -25,8 +25,6 @@
 #include <optional>
 #include <vector>

-namespace com::sun::star::lang { class XMultiServiceFactory; }
-
 class SdrModel;
 namespace chart { class ChartModel; }

@@ -22,8 +22,6 @@
 #include <comphelper/proparrhlp.hxx>
 #include <svtools/genericunodialog.hxx>

-namespace com::sun::star::beans { class XPropertySetInfo; }
-
 namespace chart
 {
 class ChartModel;
@@ -22,8 +22,6 @@
 #include <vcl/weld.hxx>
 #include <memory>

-class BuilderPage;
-
 namespace chart
 {
 class ChartModel;
@@ -29,7 +29,6 @@
 #include <AxisHelper.hxx>
 #include <CommonConverters.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <Diagram.hxx>
 #include <unonames.hxx>
 #include <BaseCoordinateSystem.hxx>
@@ -40,7 +39,6 @@
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
 #include <com/sun/star/chart/TimeInterval.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/AxisOrientation.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>

@@ -26,7 +26,6 @@
 #include <StatisticsItemConverter.hxx>
 #include <SeriesOptionsItemConverter.hxx>
 #include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
 #include <DataSeriesProperties.hxx>
 #include <Diagram.hxx>
 #include <ChartModel.hxx>
@@ -31,7 +31,6 @@
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
-#include <utility>
 #include <comphelper/diagnose_ex.hxx>

 using namespace ::com::sun::star;
@@ -35,7 +35,6 @@
 #include <ChartView.hxx>

 using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;

 namespace chart::wrapper {
@@ -23,7 +23,6 @@
 #include <ChartType.hxx>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
-#include <DiagramHelper.hxx>
 #include <Diagram.hxx>
 #include <ChartTypeHelper.hxx>
 #include <DataSeriesHelper.hxx>
@@ -23,7 +23,6 @@
 #include <ChartType.hxx>
 #include <ChartTypeHelper.hxx>
 #include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
 #include <DataSeriesProperties.hxx>
 #include <Diagram.hxx>
 #include <ItemPropertyMap.hxx>
@@ -23,7 +23,6 @@
 #include <config_wasm_strip.h>
 #include <ChartController.hxx>
 #include <ChartView.hxx>
-#include <servicenames.hxx>
 #include <ResId.hxx>
 #include <dlg_DataSource.hxx>
 #include <ChartModel.hxx>
@@ -51,7 +50,6 @@
 #include "UndoActions.hxx"
 #include <ViewElementListProvider.hxx>

-#include <comphelper/dispatchcommand.hxx>
 #include <BaseCoordinateSystem.hxx>

 #include <com/sun/star/frame/XController2.hpp>
@@ -74,7 +72,6 @@
 #include <comphelper/lok.hxx>

 #include <sfx2/sidebar/SidebarController.hxx>
-#include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>

 // this is needed to properly destroy the unique_ptr to the AcceleratorExecute
@@ -83,8 +80,6 @@
 #include <svx/ActionDescriptionProvider.hxx>
 #include <comphelper/diagnose_ex.hxx>

-#include <editeng/fontitem.hxx>
-
 // enable the following define to let the controller listen to model changes and
 // react on this by rebuilding the view
 #define TEST_ENABLE_MODIFY_LISTENER
@@ -27,8 +27,6 @@

 #include <vcl/svapp.hxx>

-using namespace ::com::sun::star;
-
 namespace chart
 {

@@ -41,7 +41,6 @@
 #include <AxisHelper.hxx>
 #include <TitleHelper.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ChartModel.hxx>
 #include <DataSeries.hxx>
 #include <DataSeriesProperties.hxx>
@@ -45,7 +45,6 @@
 #include <RegressionCurveModel.hxx>
 #include <StatisticsHelper.hxx>
 #include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
 #include <DataSeriesProperties.hxx>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
@@ -18,7 +18,6 @@
 */

 #include "ChartFrameloader.hxx"
-#include <servicenames.hxx>
 #include <MediaDescriptorHelper.hxx>
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
@@ -24,7 +24,6 @@
 #include "ChartTransferable.hxx"

 #include <sot/exchange.hxx>
-#include <sot/storage.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/graph.hxx>
 #include <svl/itempool.hxx>
@@ -28,7 +28,6 @@
 #include <LegendHelper.hxx>
 #include <ObjectIdentifier.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ChartController.hxx>
 #include <RegressionCurveHelper.hxx>
 #include <DataSeries.hxx>
@@ -46,13 +45,9 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/objsh.hxx>

-#include <com/sun/star/chart2/XRegressionCurve.hpp>
 #include <com/sun/star/chart2/XDataProviderAccess.hpp>
 #include <com/sun/star/frame/status/FontHeight.hpp>

-// only needed until #i68864# is fixed
-#include <com/sun/star/frame/XLayoutManager.hpp>
-
 using namespace ::com::sun::star;

 using ::com::sun::star::uno::Reference;
@@ -24,7 +24,6 @@
 #include <ChartModel.hxx>
 #include <Diagram.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
 #include <defines.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
@@ -20,7 +20,6 @@
 #include "ElementSelector.hxx"
 #include <ObjectNameProvider.hxx>
 #include <ObjectHierarchy.hxx>
-#include <servicenames.hxx>
 #include <DrawViewWrapper.hxx>
 #include <ResId.hxx>
 #include <strings.hrc>
@@ -34,8 +33,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>

-namespace chart { class ExplicitValueProvider; }
-
 namespace chart
 {

@@ -29,7 +29,6 @@
 #include <ChartTypeHelper.hxx>
 #include <ChartModel.hxx>
 #include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
 #include <GridProperties.hxx>
 #include <LegendHelper.hxx>
 #include <chartview/DrawModelWrapper.hxx>
@@ -10,10 +10,6 @@
 #pragma once

 #include <sfx2/sidebar/SidebarModelUpdate.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflgrit.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/xbtmpit.hxx>

 #include <svx/sidebar/AreaPropertyPanelBase.hxx>

@@ -21,10 +17,6 @@
 #include "ChartSidebarSelectionListener.hxx"
 #include "ChartColorWrapper.hxx"

-class XFillFloatTransparenceItem;
-class XFillTransparenceItem;
-class XFillColorItem;
-
 namespace chart {

 class ChartController;
@@ -17,10 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <com/sun/star/drawing/FillStyle.hpp>
-
 #include <memory>
-#include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/virdev.hxx>
@@ -28,7 +25,6 @@
 #include <ChartColorPaletteHelper.hxx>
 #include "ChartColorPaletteControl.hxx"

-#include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>

 using namespace css;
@@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <sal/log.hxx>
 #include <vcl/svapp.hxx>

 #include "ChartColorsPanel.hxx"
@@ -26,12 +25,10 @@
 #include <ChartColorPaletteHelper.hxx>
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
-#include <DataSeries.hxx>

 #include <com/sun/star/drawing/FillStyle.hpp>

 #include <sfx2/weldutils.hxx>
-#include <svtools/toolbarmenu.hxx>

 #include <algorithm>

@@ -18,7 +18,6 @@
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include "ChartSidebarModifyListener.hxx"
 #include "ChartSidebarSelectionListener.hxx"
-#include <ChartColorPalettes.hxx>

 class ToolbarUnoDispatcher;

@@ -31,7 +31,6 @@
 #include <AxisHelper.hxx>
 #include <Diagram.hxx>
 #include <ChartType.hxx>
-#include <ChartTypeHelper.hxx>
 #include <ChartModel.hxx>
 #include <BaseCoordinateSystem.hxx>

@@ -16,9 +16,6 @@
 #include "ChartSidebarSelectionListener.hxx"
 #include "ChartColorWrapper.hxx"

-class XLineTransparenceItem;
-class XLineWidthItem;
-
 namespace chart {

 class ChartController;
@@ -28,7 +28,6 @@
 #include <ChartModel.hxx>
 #include <ChartType.hxx>
 #include <DataSeries.hxx>
-#include <DataSeriesHelper.hxx>
 #include <Diagram.hxx>
 #include <RegressionCurveHelper.hxx>
 #include <RegressionCurveModel.hxx>
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <com/sun/star/chart2/ScaleData.hpp>
 #include <rtl/ref.hxx>
 #include "GridProperties.hxx"
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/range/b2irectangle.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
@@ -9,13 +9,10 @@

 #pragma once

-#include <svx/svxdllapi.h>
 #include <svx/ChartColorPaletteType.hxx>
 #include <docmodel/theme/Theme.hxx>
 #include <tools/gen.hxx>

-#include <array>
-
 class OutputDevice;

 namespace chart
@@ -26,8 +26,6 @@

 namespace chart
 {
-using namespace ::com::sun::star;
-
 class SplinePropertiesDialog;
 class SteppedPropertiesDialog;

@@ -19,7 +19,6 @@

 #pragma once

-#include <config_options.h>
 #include <com/sun/star/drawing/Direction3D.hpp>
 #include "ChartType.hxx"
 #include <rtl/ref.hxx>
@@ -27,9 +27,6 @@
 #include <vector>

 namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XChartType; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2 { class XDiagram; }
 namespace com::sun::star::chart2::data { class XDataSource; }
 namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
 namespace com::sun::star::uno { class XComponentContext; }
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <rtl/ref.hxx>

 #include <com/sun/star/uno/Reference.hxx>
@@ -18,8 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
-
 #include <rtl/ref.hxx>

 namespace chart
@@ -42,7 +42,6 @@ namespace com::sun::star::beans { class XPropertySet; }

 namespace chart
 {
-class LabeledDataSequence;
 class RegressionCurveModel;

 namespace impl
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include "StackMode.hxx"
 #include <com/sun/star/uno/Reference.h>
 #include <rtl/ustring.hxx>
@@ -30,14 +29,12 @@ namespace com::sun::star::beans { class XPropertySet; }
 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 { class Any; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
 namespace chart { class BaseCoordinateSystem; }
 namespace chart { class ChartType; }
 namespace chart { class DataSource; }
 namespace chart { class Diagram; }
 namespace chart { class DataSeries; }
-namespace chart { class ChartModel; }

 namespace chart::DataSeriesHelper
 {
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
@@ -19,7 +19,6 @@

 #pragma once

-#include <config_options.h>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ref.hxx>
@@ -19,6 +19,7 @@
 #pragma once

 #include "OPropertySet.hxx"
+#include "ChartTypeTemplate.hxx"
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/chart2/XDiagram.hpp>
@@ -31,9 +32,6 @@

 #include <vector>

-namespace com::sun::star::beans { struct PropertyValue; }
-namespace com::sun::star::chart2 { class XDataSeries; }
-namespace com::sun::star::chart2::data { class XDataSource; }
 namespace com::sun::star::uno { class XComponentContext; }

 namespace chart
@@ -42,7 +40,6 @@ class Axis;
 class BaseCoordinateSystem;
 class ChartType;
 class ChartTypeManager;
-class ChartTypeTemplate;
 class DataSeries;
 class Legend;
 class DataTable;
@@ -31,7 +31,6 @@ namespace chart
 {
 class BaseCoordinateSystem;
 class ChartType;
-class DataSeries;

 class DiagramHelper
 {
@@ -20,6 +20,7 @@

 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <rtl/ref.hxx>

 namespace chart::DisposeHelper
 {
@@ -18,8 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
-
 #include <cppuhelper/implbase.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -30,7 +28,6 @@
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/Any.h>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <unotools/weakref.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
@@ -27,7 +26,6 @@
 #include <vector>

 namespace chart { class ChartModel; }
-namespace com::sun::star::chart2::data { class XDataProvider; }
 namespace com::sun::star::chart2::data { class XDataSequence; }
 namespace com::sun::star::chart2::data { class XLabeledDataSequence; }
 namespace com::sun::star::uno { class Any; }
@@ -12,7 +12,6 @@
 // helper classes
 #include <comphelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/propertycontainer2.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <rtl/ref.hxx>
@@ -25,7 +24,6 @@
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/util/XModifiable.hpp>

 namespace chart
 {
@@ -35,8 +35,6 @@

 #include <map>

-namespace com::sun::star::chart2 { class XChartDocument; }
-
 namespace chart
 {
 class ChartModel;
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <cppuhelper/implbase.hxx>

 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
@@ -26,8 +25,6 @@
 #include "ModifyListenerHelper.hxx"

 namespace com::sun::star::chart2::data { class XDataSequence; }
-namespace com::sun::star::util { class XCloneable; }
-namespace com::sun::star::util { class XModifyListener; }

 namespace chart
 {
@@ -18,7 +18,6 @@
 */
 #pragma once

-#include <config_options.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>

--- a/Show More
+++ b/Show More