From 38ef4990bf34d7c7a7079e3b65af43656bb1845a Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Wed, 24 Apr 2019 22:48:26 +0200 Subject: tdf#42949 Fix IWYU warnings in include/svx/[a-D]* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I9770343f31f882427c9ae13e363b59cd1fb47e98 Reviewed-on: https://gerrit.libreoffice.org/71295 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- include/IwyuFilter_include.yaml | 8 ++++++++ include/svx/AccessibleControlShape.hxx | 6 ------ include/svx/AccessibleGraphicShape.hxx | 3 --- include/svx/AccessibleOLEShape.hxx | 4 ---- include/svx/AccessibleShape.hxx | 6 ------ include/svx/AffineMatrixItem.hxx | 2 -- include/svx/ChildrenManager.hxx | 4 ---- include/svx/ClassificationCommon.hxx | 16 +++++++++++++--- include/svx/ClassificationDialog.hxx | 5 +++-- include/svx/ClassificationEditView.hxx | 4 +--- include/svx/CommonStyleManager.hxx | 3 ++- include/svx/DescriptionGenerator.hxx | 6 ++++-- include/svx/algitem.hxx | 1 - include/svx/bmpmask.hxx | 2 -- include/svx/charmap.hxx | 9 +-------- include/svx/charthelper.hxx | 3 +-- include/svx/checklbx.hxx | 4 ---- include/svx/chrtitem.hxx | 2 -- include/svx/clipfmtitem.hxx | 1 - include/svx/colorwindow.hxx | 10 +++++----- include/svx/colrctrl.hxx | 4 ---- include/svx/connctrl.hxx | 5 ----- include/svx/contdlg.hxx | 1 - include/svx/ctredlin.hxx | 4 ---- include/svx/cube3d.hxx | 1 - include/svx/dataaccessdescriptor.hxx | 9 +++++++-- include/svx/databaselocationinput.hxx | 4 +++- include/svx/dbaexchange.hxx | 5 +++-- include/svx/dbaobjectex.hxx | 5 ++--- include/svx/def3d.hxx | 1 - include/svx/deflt3d.hxx | 1 - include/svx/dialcontrol.hxx | 3 +-- include/svx/dialogs.hrc | 3 +-- include/svx/dlgctrl.hxx | 6 +----- include/svx/dlgutil.hxx | 2 +- include/svx/drawitem.hxx | 1 - include/svx/fontwork.hxx | 1 + include/svx/itemwin.hxx | 1 + 38 files changed, 59 insertions(+), 97 deletions(-) (limited to 'include') diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 24243b9ef476..5ec1ba2b23de 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -920,3 +920,11 @@ blacklist: - com/sun/star/awt/FontDescriptor.hpp - com/sun/star/style/LineSpacing.hpp - com/sun/star/style/TabStop.hpp + include/svx/AccessibleControlShape.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertyChangeListener.hpp + - com/sun/star/container/XContainerListener.hpp + - com/sun/star/util/XModeChangeListener.hpp + include/svx/dbaexchange.hxx: + # Needed for implicit dtor + - com/sun/star/beans/PropertyValue.hpp diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index cfac0bebfe03..5b0e49941741 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -20,15 +20,10 @@ #ifndef INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX #define INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX -#include - -#include #include #include #include -#include #include -#include #include #include #include @@ -59,7 +54,6 @@ namespace comphelper class OWrappedAccessibleChildrenManager; } -class SdrObject; namespace accessibility { class AccessibleShapeInfo; diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index 1d4e7a5e5339..7be88770c30c 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX #define INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX -#include - #include #include -#include #include #include #include diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index 997d3dd98b8b..c25eb75fae54 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -20,13 +20,9 @@ #ifndef INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX #define INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX -#include - #include -#include #include #include -#include #include #include #include diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index e1af1501bf7f..895825675216 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -21,8 +21,6 @@ #ifndef INCLUDED_SVX_ACCESSIBLESHAPE_HXX #define INCLUDED_SVX_ACCESSIBLESHAPE_HXX -#include - #include #include #include @@ -33,11 +31,8 @@ #include #include #include -#include -#include #include #include -#include #include #include #include @@ -70,7 +65,6 @@ class AccessibleShapeInfo; class AccessibleTextHelper; class ChildrenManager; class IAccessibleParent; -class IAccessibleViewForwarder; /** This base class provides a base implementation for all shapes. For more detailed documentation about the methods refer to the descriptions of diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index dad733a33b50..59d4442b7a61 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -20,13 +20,11 @@ #define INCLUDED_SVX_AFFINEMATRIXITEM_HXX #include -#include #include #include #include class SfxItemPool; -class SvStream; class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem { diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 7023fd6467f3..901d4c891cf3 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -22,11 +22,8 @@ #include -#include #include -#include #include -#include #include namespace com { namespace sun { namespace star { @@ -40,7 +37,6 @@ namespace accessibility { class AccessibleContextBase; class AccessibleShapeTreeInfo; class ChildrenManagerImpl; -class IAccessibleViewForwarder; /** The AccessibleChildrenManager class acts as a cache of the accessible objects of the currently visible shapes of a draw page and as diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx index 75ab8682d34f..52fc3db393e8 100644 --- a/include/svx/ClassificationCommon.hxx +++ b/include/svx/ClassificationCommon.hxx @@ -13,11 +13,21 @@ #include #include -#include #include #include -#include -#include + +namespace com::sun::star::beans +{ +class XPropertyContainer; +} +namespace com::sun::star::beans +{ +struct Property; +} +namespace svx +{ +class ClassificationResult; +} namespace svx { diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 0c083d794d41..edc21e14e50d 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -12,13 +12,14 @@ #define INCLUDED_SVX_CLASSIFICATIONDIALOG_HXX #include -#include #include #include -#include #include #include +namespace svx { class ClassificationEditView; } +namespace weld { class CustomWeld; } + namespace svx { class SVX_DLLPUBLIC ClassificationDialog : public weld::GenericDialogController diff --git a/include/svx/ClassificationEditView.hxx b/include/svx/ClassificationEditView.hxx index 656219c141f2..7c7070e8a2fd 100644 --- a/include/svx/ClassificationEditView.hxx +++ b/include/svx/ClassificationEditView.hxx @@ -13,11 +13,9 @@ #include #include -#include -#include -#include #include #include +#include #include namespace svx { diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx index 261472124596..6d87dd8f45de 100644 --- a/include/svx/CommonStyleManager.hxx +++ b/include/svx/CommonStyleManager.hxx @@ -11,9 +11,10 @@ #define INCLUDED_SVX_COMMONSTYLEMANAGER_HXX #include -#include #include +namespace sfx2 { class StylePreviewRenderer; } + class OutputDevice; class SfxObjectShell; class SfxStyleSheetBase; diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx index 6a7b57fc6bde..600b5fc0c744 100644 --- a/include/svx/DescriptionGenerator.hxx +++ b/include/svx/DescriptionGenerator.hxx @@ -21,11 +21,13 @@ #ifndef INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX #define INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX -#include -#include +#include #include #include +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::drawing { class XShape; } + namespace accessibility { diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index ee6eee0bec89..5ba94bcea2a1 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_ALGITEM_HXX #define INCLUDED_SVX_ALGITEM_HXX -#include #include #include #include diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 26f8791f49f2..3c7387276835 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -38,7 +37,6 @@ namespace vcl { class Window; } class CheckBox; -class ColorLB; class MetricField; class PushButton; class SfxBindings; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index df6b29e1ef21..e4db794c1d57 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -30,23 +30,16 @@ #include #include #include -#include -#include -#include -#include #include #include #include #include -#include -#include -#include namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } -namespace vcl { class Font; } +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star; diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 7b6b0cf2e27c..e5435562cdca 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -20,15 +20,14 @@ #ifndef INCLUDED_SVX_CHARTHELPER_HXX #define INCLUDED_SVX_CHARTHELPER_HXX -#include #include #include #include namespace com { namespace sun { namespace star { - namespace chart2 { class XDiagram; } namespace embed { class XEmbeddedObject; } namespace frame { class XModel; } + namespace uno { template class Reference; } } } } namespace basegfx { class B2DRange; } diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index a10e5b999b10..44eeb3631143 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -21,17 +21,13 @@ #define INCLUDED_SVX_CHECKLBX_HXX #include -#include #include #include -#include #include #include -#include #include #include -class Image; class SvLBoxButtonData; class SvTreeListEntry; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 5accfe78e0f9..344508e37581 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_CHRTITEM_HXX #define INCLUDED_SVX_CHRTITEM_HXX -#include #include #include #include @@ -28,7 +27,6 @@ class IntlWrapper; class SfxItemPool; -class SvStream; enum class SvxChartTextOrder { diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index c5c4d8960e79..795c1fbf8cfa 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 668da9b6036d..183a29d231ba 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -20,19 +20,19 @@ #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX #define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX -#include #include -#include -#include #include -#include #include -#include +#include #include #include #include +namespace com::sun::star::frame { class XFrame; } + +class PaletteManager; + class SVX_DLLPUBLIC ColorStatus { Color maColor; diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 66addcee31c5..e7ff30f3bb4f 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -23,18 +23,14 @@ #include #include #include -#include #include #include #include #include -#include -#include #include namespace vcl { class Window; } -class CommandEvent; class SfxBindings; class SfxBroadcaster; class SfxChildWindow; diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index bafcc6c892e8..ac1880bd56de 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -21,15 +21,10 @@ #include #include -#include -#include #include -#include #include #include -namespace vcl { class Window; } - class SfxItemSet; class SdrEdgeObj; class SdrView; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index cf9946c921d3..2153ececae5e 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -29,7 +29,6 @@ #include #include -class Rectangle; class SfxBindings; class SfxModule; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 3e2e88367156..946ffb414dfa 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include @@ -52,14 +51,11 @@ namespace utl { namespace vcl { class Window; } -class Button; -class CheckBox; class DateField; class Edit; class FixedText; class ListBox; class Point; -class PushButton; class SvViewDataEntry; class TimeField; struct SvSortData; diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index b67d6995a5de..4f8a3f23c25d 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include namespace sdr { namespace contact { class ViewContact; } } diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx index e66e96513356..92e992c2ce74 100644 --- a/include/svx/dataaccessdescriptor.hxx +++ b/include/svx/dataaccessdescriptor.hxx @@ -20,11 +20,16 @@ #ifndef INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX #define INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX -#include -#include +#include #include #include +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { class Any; } +namespace com::sun::star::uno { template class Sequence; } +namespace com::sun::star::uno { template class Reference; } + namespace svx { class ODADescriptorImpl; diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx index b20846c80ce7..723bc7fc9e20 100644 --- a/include/svx/databaselocationinput.hxx +++ b/include/svx/databaselocationinput.hxx @@ -21,12 +21,14 @@ #define INCLUDED_SVX_DATABASELOCATIONINPUT_HXX #include -#include +#include #include class PushButton; namespace svt { class OFileURLControl; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template class Reference; } namespace svx { diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index 1a5927f84dfc..bd084661b2d7 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -24,12 +24,13 @@ #include #include -#include -#include +#include #include #include #include +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::beans { class XPropertySet; } // column transfer formats enum class ColumnTransferFormatFlags diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index e9410ea65632..4fe92b407d3a 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -21,12 +21,11 @@ #define INCLUDED_SVX_DBAOBJECTEX_HXX #include -#include -#include -#include #include #include +namespace com::sun::star::ucb { class XContent; } + namespace svx { diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx index e7eeec93690c..5f4351d350ec 100644 --- a/include/svx/def3d.hxx +++ b/include/svx/def3d.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_DEF3D_HXX #include -#include const double fPiDiv180 = 0.01745329251994; const double EPSILON = 1e-06; diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx index e08e9945fa96..8a482e37ab2c 100644 --- a/include/svx/deflt3d.hxx +++ b/include/svx/deflt3d.hxx @@ -23,7 +23,6 @@ #include #include #include -#include /************************************************************************* |* diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 7a15736372cf..c15e0ae92e3c 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -23,11 +23,10 @@ #include #include #include -#include +#include #include #include -class NumericField; class Edit; namespace svx { diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 78d00f86a2da..f5da4ede3e12 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -20,8 +20,7 @@ #ifndef INCLUDED_SVX_DIALOGS_HRC #define INCLUDED_SVX_DIALOGS_HRC -#include -#include +#include // factory IDs of tabpages implemented in CUI #define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index de0d65259c50..e682659367f0 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -19,12 +19,11 @@ #ifndef INCLUDED_SVX_DLGCTRL_HXX #define INCLUDED_SVX_DLGCTRL_HXX -#include #include #include #include -#include #include +#include #include #include #include @@ -33,9 +32,6 @@ #include #include -class XOBitmap; -class XOutdevItemPool; - namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } } diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx index 55c914bfd864..cc31297f5bb5 100644 --- a/include/svx/dlgutil.hxx +++ b/include/svx/dlgutil.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_DLGUTIL_HXX #define INCLUDED_SVX_DLGUTIL_HXX -#include +#include #include #include diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index f9e68d5bdb39..b65b07366e62 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -21,7 +21,6 @@ #include #include -#include #include class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 405edcce644f..824b7104ed37 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index ac910a8f6fc5..efeebed13f79 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SVX_ITEMWIN_HXX #include +#include #include #include -- cgit