diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-05-28 20:58:09 +0200 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2018-06-13 17:27:48 +0200 |
commit | 0554e74260ee684d0859d655e42da8ad6eefd4a9 (patch) | |
tree | 800e4555a90f779a5a52a9ff3d9a383302ae5994 /chart2/source/controller/inc | |
parent | 5db29ca06b56bb235b0e8dfd0956715730f9cf0d (diff) |
tdf#42949 Fix IWYU warnings in chart2/source/controller/inc/[I-V]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
A bit of fallout management as well.
Change-Id: Ie058eac6608d7c6dc2cfb29f1081b6684a4412ac
Reviewed-on: https://gerrit.libreoffice.org/55541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'chart2/source/controller/inc')
23 files changed, 69 insertions, 62 deletions
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index ea7b675f33fa..58b8cc303418 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -21,6 +21,7 @@ #include "ItemConverter.hxx" #include "GraphicPropertyItemConverter.hxx" +#include <com/sun/star/uno/Sequence.h> #include <tools/color.hxx> diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 9c2609897230..b8fa2614d6bf 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -21,10 +21,12 @@ #include <unotools/eventlisteneradapter.hxx> #include <svl/itemset.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <utility> +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } + namespace chart { namespace wrapper { diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index 231f857f16e6..a466a0886fde 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -20,11 +20,12 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_LEGENDITEMCONVERTER_HXX #include "ItemConverter.hxx" -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vector> +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + class SdrModel; namespace chart diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 8969a106ce93..05e435c3830f 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -20,9 +20,10 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLECHARTCONVERTERS_HXX #include "MultipleItemConverter.hxx" -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> + +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } class SdrModel; diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx index 76a694dac9f0..10b95b951949 100644 --- a/chart2/source/controller/inc/ObjectHierarchy.hxx +++ b/chart2/source/controller/inc/ObjectHierarchy.hxx @@ -21,9 +21,8 @@ #include <ObjectIdentifier.hxx> -#include <rtl/ustring.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/awt/KeyEvent.hpp> +namespace com { namespace sun { namespace star { namespace awt { struct KeyEvent; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } #include <memory> #include <vector> diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx index 1c01cccbd335..3df39335cd80 100644 --- a/chart2/source/controller/inc/ObjectNameProvider.hxx +++ b/chart2/source/controller/inc/ObjectNameProvider.hxx @@ -22,8 +22,9 @@ #include <ObjectIdentifier.hxx> #include <TitleHelper.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> + +namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace chart { diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx index 8f98280f5ad5..f1236e68b851 100644 --- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx +++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx @@ -21,7 +21,8 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_POSITIONANDSIZEHELPER_HXX #include <ObjectIdentifier.hxx> -#include <com/sun/star/frame/XModel.hpp> + +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace chart { diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index 0b2ab7153e52..e1f69777b6c9 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -19,14 +19,17 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONHELPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONHELPER_HXX -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/uno/Sequence.h> +#include <rtl/ustring.hxx> + +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } namespace com { namespace sun { namespace star { namespace sheet{ class XRangeSelection; class XRangeSelectionListener; - class XCellRangesAccess; } }}} diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 1874f0c49168..47ae70a881a6 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -21,8 +21,9 @@ #include <ControllerLockGuard.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/sheet/XRangeSelectionListener.hpp> + +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace sheet { class XRangeSelectionListener; } } } } namespace chart { diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index c61489a45ee5..4b4585e1db61 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -21,11 +21,8 @@ #include "ItemConverter.hxx" -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <memory> -#include <vector> +namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } class SdrModel; diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index d2a80c933663..25a540ff5aef 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -20,14 +20,13 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_REGRESSIONEQUATIONITEMCONVERTER_HXX #include "ItemConverter.hxx" -#include "GraphicPropertyItemConverter.hxx" - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/Size.hpp> #include <vector> +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + class SdrModel; namespace chart { namespace wrapper { diff --git a/chart2/source/controller/inc/SelectionHelper.hxx b/chart2/source/controller/inc/SelectionHelper.hxx index a3002dda8a7f..b9fe3fc20377 100644 --- a/chart2/source/controller/inc/SelectionHelper.hxx +++ b/chart2/source/controller/inc/SelectionHelper.hxx @@ -23,14 +23,12 @@ #include <ObjectIdentifier.hxx> class SdrObject; -#include <svx/svdtypes.hxx> -#include <com/sun/star/drawing/XShape.hpp> + +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } namespace chart { -class ObjectIdentifier; - class Selection { public: //methods diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index c04b626a026f..2181d9165eb9 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -20,10 +20,11 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_SERIESOPTIONSITEMCONVERTER_HXX #include "ItemConverter.hxx" +#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/chart2/XCoordinateSystem.hpp> +namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace chart { diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 26bfd9caa281..40fe5e2d7804 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -19,13 +19,9 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_STATISTICSITEMCONVERTER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_STATISTICSITEMCONVERTER_HXX -#include <com/sun/star/frame/XModel.hpp> - #include "ItemConverter.hxx" -#include "GraphicPropertyItemConverter.hxx" -#include <NumberFormatterWrapper.hxx> -#include <vector> +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace chart { diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index 6ad7335d989e..01e7b490d5a3 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -19,14 +19,13 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TABPAGENOTIFIABLE_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TABPAGENOTIFIABLE_HXX -#include <vcl/tabpage.hxx> -#include <tools/color.hxx> - // color to use as foreground for an invalid range #define RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR COL_WHITE // color to use as background for an invalid range #define RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR Color(0xff6563) +class TabPage; + namespace chart { diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx index f1e227691c14..3ca0ca7d7e69 100644 --- a/chart2/source/controller/inc/TextLabelItemConverter.hxx +++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx @@ -21,12 +21,14 @@ #include "ItemConverter.hxx" -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/uno/Sequence.h> #include <vector> +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + namespace chart { namespace wrapper { class TextLabelItemConverter : public ItemConverter diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index d368fce0cd3f..932700653fd5 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -19,12 +19,14 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TIMERTRIGGEREDCONTROLLERLOCK_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TIMERTRIGGEREDCONTROLLERLOCK_HXX -#include <ControllerLockGuard.hxx> +#include <com/sun/star/uno/Reference.h> #include <vcl/timer.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace chart { class ControllerLockGuardUNO; } + namespace chart { diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx index 17d3d21c73d5..634ed5b76138 100644 --- a/chart2/source/controller/inc/TitleDialogData.hxx +++ b/chart2/source/controller/inc/TitleDialogData.hxx @@ -20,11 +20,12 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEDIALOGDATA_HXX #include <ReferenceSizeProvider.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace chart { diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 7d28217f79fd..b49a80269680 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -20,11 +20,12 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEITEMCONVERTER_HXX #include "ItemConverter.hxx" -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vector> +namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + class SdrModel; namespace chart { namespace wrapper { diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx index be224d2328b8..07da949907af 100644 --- a/chart2/source/controller/inc/ViewElementListProvider.hxx +++ b/chart2/source/controller/inc/ViewElementListProvider.hxx @@ -21,9 +21,10 @@ #include <memory> #include <svx/xtable.hxx> -#include <svx/svdpage.hxx> class FontList; +class SdrObjList; +class SfxItemSet; namespace chart { diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index a2688c288da4..7df3664bd27e 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -21,18 +21,15 @@ #include <memory> #include <vcl/button.hxx> -#include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> +#include <vcl/layout.hxx> #include <svl/itemset.hxx> #include <svx/chrtitem.hxx> -#include <chartview/ChartSfxItemIds.hxx> #include "RangeSelectionListener.hxx" -#include <com/sun/star/chart2/XChartDocument.hpp> - -class Dialog; +namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } } namespace chart { diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index bed2a64cfc8d..928a94f544b0 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -19,12 +19,13 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX -#include <vcl/builder.hxx> #include <vcl/button.hxx> -#include <vcl/fixed.hxx> #include <svl/itemset.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> + +class VclBuilderContainer; + +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace chart { diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx index 1902a5773859..a5b93310e36d 100644 --- a/chart2/source/controller/inc/res_Titles.hxx +++ b/chart2/source/controller/inc/res_Titles.hxx @@ -20,9 +20,11 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX #include "TitleDialogData.hxx" -#include <vcl/builder.hxx> #include <vcl/fixed.hxx> +class VclBuilderContainer; +class Edit; + namespace chart { |