chart2/IwyuFilter_chart2.yaml | 47 ++++++++++ chart2/source/controller/accessibility/AccessibleChartElement.cxx | 2 chart2/source/controller/accessibility/AccessibleChartElement.hxx | 21 ---- chart2/source/controller/accessibility/ChartElementFactory.hxx | 3 chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx | 5 - chart2/source/controller/main/ChartFrameloader.cxx | 1 chart2/source/controller/main/ChartFrameloader.hxx | 3 chart2/source/controller/main/ChartModelClone.cxx | 1 chart2/source/controller/main/ChartModelClone.hxx | 7 + chart2/source/controller/main/CommandDispatch.hxx | 6 - chart2/source/controller/main/ControllerCommandDispatch.hxx | 4 chart2/source/controller/main/DragMethod_Base.cxx | 1 chart2/source/controller/main/DragMethod_Base.hxx | 4 chart2/source/controller/main/DragMethod_PieSegment.cxx | 1 chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 1 chart2/source/controller/main/DragMethod_RotateDiagram.hxx | 3 chart2/source/controller/main/ElementSelector.hxx | 2 chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 1 chart2/source/controller/main/StatusBarCommandDispatch.cxx | 2 chart2/source/controller/main/StatusBarCommandDispatch.hxx | 8 + chart2/source/controller/main/UndoActions.hxx | 6 - chart2/source/controller/main/UndoCommandDispatch.hxx | 4 chart2/source/controller/main/UndoGuard.cxx | 2 chart2/source/controller/main/UndoGuard.hxx | 6 - chart2/source/controller/sidebar/Chart2PanelFactory.hxx | 1 chart2/source/controller/sidebar/ChartAreaPanel.hxx | 13 -- chart2/source/controller/sidebar/ChartAxisPanel.hxx | 5 - chart2/source/controller/sidebar/ChartColorWrapper.hxx | 5 - chart2/source/controller/sidebar/ChartElementsPanel.hxx | 5 - chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 4 chart2/source/controller/sidebar/ChartLinePanel.hxx | 29 +----- chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 6 - chart2/source/inc/chartview/ChartSfxItemIds.hxx | 4 33 files changed, 116 insertions(+), 97 deletions(-)
New commits: commit ec06ffdfd54b1f6997f905f9252cecabde3a1c5a Author: Gabor Kelemen <kelem...@ubuntu.com> AuthorDate: Tue Sep 11 19:10:32 2018 +0200 Commit: Miklos Vajna <vmik...@collabora.co.uk> CommitDate: Wed Sep 12 09:43:41 2018 +0200 tdf#42949 Fix IWYU warnings in chart2/source/controller/[a,i,m,s]*/*hxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I5f445522e9a1ccd60555e992adf345b254b2ac83 Reviewed-on: https://gerrit.libreoffice.org/60335 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk> diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index f3899404d2c8..f95575b0282c 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -393,3 +393,50 @@ blacklist: 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 + - com/sun/star/accessibility/XAccessibleExtendedComponent.hpp + chart2/source/controller/accessibility/AccessibleChartElement.hxx: + # base class has to be a complete type + - AccessibleBase.hxx + - com/sun/star/accessibility/XAccessibleExtendedComponent.hpp + chart2/source/controller/main/ChartModelClone.hxx: + # Needed for implicit dtor + - com/sun/star/uno/Any.hxx + chart2/source/controller/main/ChartFrameloader.hxx: + # base class has to be a complete type + - com/sun/star/frame/XSynchronousFrameLoader.hpp + - com/sun/star/lang/XServiceInfo.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 + chart2/source/controller/main/StatusBarCommandDispatch.hxx: + # base class has to be a complete type + - CommandDispatch.hxx + - com/sun/star/view/XSelectionChangeListener.hpp + chart2/source/controller/main/UndoActions.hxx: + # base class has to be a complete type + - com/sun/star/document/XUndoAction.hpp + chart2/source/controller/sidebar/Chart2PanelFactory.hxx: + # base class has to be a complete type + - com/sun/star/ui/XUIElementFactory.hpp + - com/sun/star/lang/XServiceInfo.hpp + chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx: + # base class has to be a complete type + - com/sun/star/util/XModifyListener.hpp + chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx: + # base class has to be a complete type + - com/sun/star/view/XSelectionChangeListener.hpp diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index a126bc134cfb..b66d59b114e5 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -25,10 +25,12 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/chart2/XTitle.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 1e79f684b84c..e4b8f9cd3d53 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -20,24 +20,11 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_ACCESSIBLECHARTELEMENT_HXX #include <AccessibleBase.hxx> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/accessibility/XAccessible.hpp> -#include <com/sun/star/accessibility/XAccessibleContext.hpp> -#include <com/sun/star/accessibility/XAccessibleComponent.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/accessibleeventnotifier.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> -#include <unotools/accessiblestatesethelper.hxx> - -#include <vector> -#include <map> + +namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } +namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } } +namespace com { namespace sun { namespace star { namespace awt { class XFont; } } } } namespace chart { diff --git a/chart2/source/controller/accessibility/ChartElementFactory.hxx b/chart2/source/controller/accessibility/ChartElementFactory.hxx index 9a59a8ebdf85..2d0b29b9cb2a 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.hxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.hxx @@ -19,12 +19,11 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_CHARTELEMENTFACTORY_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_ACCESSIBILITY_CHARTELEMENTFACTORY_HXX -#include <AccessibleBase.hxx> - namespace chart { class AccessibleBase; +struct AccessibleElementInfo; class ChartElementFactory { diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 8ec702ff8813..b8c85f61c046 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -19,15 +19,10 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_ITEMSETWRAPPER_SCHWHICHPAIRS_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_ITEMSETWRAPPER_SCHWHICHPAIRS_HXX -#include <svl/intitem.hxx> -#include <svl/ilstitem.hxx> #include <svx/svxids.hrc> #include <svx/xdef.hxx> #include <svx/svddef.hxx> -#include <svx/chrtitem.hxx> -#include <editeng/brushitem.hxx> #include <editeng/eeitem.hxx> -#include <editeng/sizeitem.hxx> #include <chartview/ChartSfxItemIds.hxx> diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index b55d6ee48f58..00d58ea7f0f3 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/frame/XLoadable.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <tools/diagnose_ex.h> namespace chart diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index a6911dd7710d..9287198aa62b 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -22,9 +22,10 @@ #include <osl/conditn.hxx> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace chart { diff --git a/chart2/source/controller/main/ChartModelClone.cxx b/chart2/source/controller/main/ChartModelClone.cxx index 1b2f828d3f79..339547943552 100644 --- a/chart2/source/controller/main/ChartModelClone.cxx +++ b/chart2/source/controller/main/ChartModelClone.cxx @@ -24,6 +24,7 @@ #include <DataSourceHelper.hxx> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> +#include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/chart2/source/controller/main/ChartModelClone.hxx b/chart2/source/controller/main/ChartModelClone.hxx index a12adda1bc01..8d1dbb0edc55 100644 --- a/chart2/source/controller/main/ChartModelClone.hxx +++ b/chart2/source/controller/main/ChartModelClone.hxx @@ -20,8 +20,11 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTMODELCLONE_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTMODELCLONE_HXX -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/chart2/XInternalDataProvider.hpp> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Reference.h> + +namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace chart { diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index c21c6b7b8164..761ade94b3fc 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -24,12 +24,12 @@ #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <vector> #include <map> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace util { class XURLTransformer; } } } } + namespace chart { diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index f0b125444bf6..4e105f86702c 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -20,12 +20,14 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CONTROLLERCOMMANDDISPATCH_HXX #include "CommandDispatch.hxx" -#include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/view/XSelectionChangeListener.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } + namespace chart { diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index 1739833ed94b..9d8a2b6d84b0 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -18,6 +18,7 @@ */ #include "DragMethod_Base.hxx" +#include <DrawViewWrapper.hxx> #include <ObjectNameProvider.hxx> #include <ObjectIdentifier.hxx> diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index a25457a37ae4..d9fc78d72be9 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -19,11 +19,13 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_DRAGMETHOD_BASE_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_DRAGMETHOD_BASE_HXX -#include <DrawViewWrapper.hxx> #include <svx/ActionDescriptionProvider.hxx> #include <svx/svddrgmt.hxx> #include <cppuhelper/weakref.hxx> +namespace chart { class DrawViewWrapper; } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + namespace chart { diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 4731c8252ee7..c150e7b297c9 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -18,6 +18,7 @@ */ #include "DragMethod_PieSegment.hxx" +#include <DrawViewWrapper.hxx> #include <strings.hrc> #include <ResId.hxx> diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index a2a46befe667..87415cdcaee2 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -18,6 +18,7 @@ */ #include "DragMethod_RotateDiagram.hxx" +#include <DrawViewWrapper.hxx> #include <SelectionHelper.hxx> #include <CommonConverters.hxx> diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 286078ebfcc7..863e7559f3b3 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -23,6 +23,9 @@ #include <basegfx/polygon/b3dpolypolygon.hxx> +class E3dScene; +namespace chart { class DrawViewWrapper; } + namespace chart { diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index ab1818bf1e15..e59984e709fa 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX -#include <ObjectHierarchy.hxx> +#include <ObjectIdentifier.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase1.hxx> #include <svtools/toolboxcontroller.hxx> diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 6d06c63d240a..b6ed23d3d073 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -22,7 +22,6 @@ #include "CommandDispatch.hxx" #include <com/sun/star/frame/DispatchInformation.hpp> -#include <com/sun/star/util/URL.hpp> namespace chart { diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 63766b9b49ed..fc4d71b40906 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -21,6 +21,8 @@ #include <ObjectNameProvider.hxx> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> +#include <com/sun/star/util/XModifiable.hpp> using namespace ::com::sun::star; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index de2f61b2a6c0..6c3734154ecf 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -22,9 +22,11 @@ #include "CommandDispatch.hxx" #include <ObjectIdentifier.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <com/sun/star/util/XModifiable.hpp> +#include <com/sun/star/view/XSelectionChangeListener.hpp> + +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace util { class XModifiable; } } } } +namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } } namespace chart { diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index f1ecf3ee131a..598bf4f25430 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -19,17 +19,15 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_UNDOACTIONS_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_UNDOACTIONS_HXX -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/document/XUndoAction.hpp> #include <rtl/ustring.hxx> -#include <unotools/configitem.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <memory> -#include <deque> -#include <utility> + +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } class SdrUndoAction; diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index db6e299c0efd..60a8273135b4 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -21,8 +21,8 @@ #include "CommandDispatch.hxx" -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/document/XUndoManager.hpp> +namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } namespace chart { diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx index 2bb5008dde09..ec6f97b0b3ca 100644 --- a/chart2/source/controller/main/UndoGuard.cxx +++ b/chart2/source/controller/main/UndoGuard.cxx @@ -22,6 +22,8 @@ #include "UndoActions.hxx" #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/document/XUndoManager.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <tools/diagnose_ex.h> diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx index b8ade04817d8..5f3331ed63c0 100644 --- a/chart2/source/controller/main/UndoGuard.hxx +++ b/chart2/source/controller/main/UndoGuard.hxx @@ -21,13 +21,13 @@ #include "ChartModelClone.hxx" -#include <com/sun/star/document/XUndoManager.hpp> -#include <com/sun/star/frame/XModel.hpp> - #include <rtl/ustring.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace document { class XUndoManager; } } } } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + namespace chart { diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx index 14570c143a88..4a1b043c1130 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx @@ -21,7 +21,6 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx index 234a23e4f392..454c99a86851 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx @@ -10,20 +10,11 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTAREAPANEL_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTAREAPANEL_HXX -#include <vcl/ctrl.hxx> -#include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> -#include <svx/xgrad.hxx> -#include <svx/itemwin.hxx> #include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> -#include <svx/drawitem.hxx> -#include <svx/sidebar/PanelLayout.hxx> -#include <svl/intitem.hxx> -#include <com/sun/star/ui/XUIElement.hpp> #include <svx/sidebar/AreaPropertyPanelBase.hxx> @@ -33,11 +24,7 @@ class XFillFloatTransparenceItem; class XFillTransparenceItem; -class XFillStyleItem; -class XFillGradientItem; class XFillColorItem; -class XFillHatchItem; -class XFillBitmapItem; namespace chart { diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index a6fe43feb11f..2b651d8d95f6 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -20,10 +20,9 @@ #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" -#include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/view/XSelectionChangeListener.hpp> +namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } +namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } } -class FixedText; class ListBox; class MetricField; diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.hxx b/chart2/source/controller/sidebar/ChartColorWrapper.hxx index 9237bf36e218..05b0e9f38fea 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.hxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.hxx @@ -10,10 +10,11 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTCOLORWRAPPER_HXX -#include <com/sun/star/frame/XModel.hpp> -#include <tools/color.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <svx/Palette.hxx> +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + class SvxColorToolBoxControl; namespace chart { namespace sidebar { diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 512749246a24..eca293645cc4 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTELEMENTSPANEL_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTELEMENTSPANEL_HXX -#include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <svx/sidebar/PanelLayout.hxx> @@ -27,11 +26,9 @@ #include "ChartSidebarModifyListener.hxx" #include <TitleHelper.hxx> -#include <com/sun/star/util/XModifyListener.hpp> +namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } -class FixedText; class ListBox; -class NumericField; namespace chart { diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index 5a55b7402293..f4dec42c5521 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -18,12 +18,10 @@ #include "ChartSidebarModifyListener.hxx" -#include <com/sun/star/util/XModifyListener.hpp> +namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } -class FixedText; class ListBox; class NumericField; -class MetricField; class Edit; namespace chart { diff --git a/chart2/source/controller/sidebar/ChartLinePanel.hxx b/chart2/source/controller/sidebar/ChartLinePanel.hxx index 6222a1ddfa55..c0b3d19fd579 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.hxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.hxx @@ -10,34 +10,21 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTLINEPANEL_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_SIDEBAR_CHARTLINEPANEL_HXX -#include <vcl/ctrl.hxx> -#include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> -#include <svx/xgrad.hxx> -#include <svx/itemwin.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> -#include <svx/xflgrit.hxx> -#include <svx/xflhtit.hxx> -#include <svx/xbtmpit.hxx> -#include <svx/drawitem.hxx> -#include <svx/sidebar/PanelLayout.hxx> -#include <svl/intitem.hxx> -#include <com/sun/star/ui/XUIElement.hpp> - #include <svx/sidebar/LinePropertyPanelBase.hxx> #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" #include "ChartColorWrapper.hxx" -class XFillFloatTransparenceItem; -class XFillTransparenceItem; -class XFillStyleItem; -class XFillGradientItem; -class XFillColorItem; -class XFillHatchItem; -class XFillBitmapItem; +class XLineCapItem; +class XLineDashItem; +class XLineEndItem; +class XLineJointItem; +class XLineStartItem; +class XLineStyleItem; +class XLineTransparenceItem; +class XLineWidthItem; namespace chart { diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 2569f617bf18..ba5d55a6b210 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -28,12 +28,10 @@ #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" -#include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/view/XSelectionChangeListener.hpp> +namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } } +namespace com { namespace sun { namespace star { namespace view { class XSelectionChangeListener; } } } } -class FixedText; class ListBox; -class NumericField; namespace chart { diff --git a/chart2/source/inc/chartview/ChartSfxItemIds.hxx b/chart2/source/inc/chartview/ChartSfxItemIds.hxx index 81ab1aa77ef6..8fbbaad8fa70 100644 --- a/chart2/source/inc/chartview/ChartSfxItemIds.hxx +++ b/chart2/source/inc/chartview/ChartSfxItemIds.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTSFXITEMIDS_HXX #define INCLUDED_CHART2_SOURCE_INC_CHARTVIEW_CHARTSFXITEMIDS_HXX +#include <svl/ilstitem.hxx> +#include <svx/chrtitem.hxx> +#include <editeng/brushitem.hxx> + // SCHATTR // can't this be changed to 0? _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits