sw/IwyuFilter_sw.yaml | 3 +++ sw/source/uibase/app/swdllimpl.hxx | 2 ++ sw/source/uibase/docvw/romenu.hxx | 1 - sw/source/uibase/sidebar/PageColumnControl.cxx | 2 ++ sw/source/uibase/sidebar/PageColumnControl.hxx | 5 +---- sw/source/uibase/sidebar/PageFooterPanel.hxx | 8 -------- sw/source/uibase/sidebar/PageFormatPanel.hxx | 9 --------- sw/source/uibase/sidebar/PageHeaderPanel.hxx | 8 -------- sw/source/uibase/sidebar/PageMarginControl.cxx | 3 +++ sw/source/uibase/sidebar/PageMarginControl.hxx | 9 +-------- sw/source/uibase/sidebar/PageMarginUtils.hxx | 2 +- sw/source/uibase/sidebar/PageOrientationControl.hxx | 2 +- sw/source/uibase/sidebar/PageSizeControl.cxx | 1 + sw/source/uibase/sidebar/PageSizeControl.hxx | 3 +-- sw/source/uibase/sidebar/PageStylesPanel.cxx | 1 + sw/source/uibase/sidebar/PageStylesPanel.hxx | 11 ----------- sw/source/uibase/sidebar/StylePresetsPanel.hxx | 18 ------------------ sw/source/uibase/sidebar/ThemePanel.cxx | 1 + sw/source/uibase/sidebar/ThemePanel.hxx | 14 -------------- sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 1 - sw/source/uibase/table/tablepg.hxx | 1 - sw/source/uibase/uiview/viewfunc.hxx | 5 ++++- sw/source/uibase/uno/SwXDocumentSettings.hxx | 1 - sw/source/uibase/uno/unomodule.hxx | 1 - 24 files changed, 22 insertions(+), 90 deletions(-)
New commits: commit 7d44104f526d61152cac67d534d36169f46c7581 Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Fri Aug 9 08:25:04 2019 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Aug 9 09:52:06 2019 +0200 tdf#42949 Fix IWYU warnings in sw/source/uibase/*/*hxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I611478d4ade6d05625f599f9d51dd0e1335e7b0a Reviewed-on: https://gerrit.libreoffice.org/77180 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmik...@collabora.com> diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 1809d19c76cc..4cdfafc47c98 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -450,3 +450,6 @@ blacklist: - comphelper/scopeguard.hxx sw/source/filter/html/htmlreqifreader.cxx: - comphelper/scopeguard.hxx + sw/source/uibase/sidebar/PageMarginUtils.hxx: + # Needed for std::abs + - cmath diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx index 44131eadfccf..bcbcaf005df9 100644 --- a/sw/source/uibase/app/swdllimpl.hxx +++ b/sw/source/uibase/app/swdllimpl.hxx @@ -12,6 +12,8 @@ #include <sal/config.h> +#include <sal/types.h> + #include <memory> namespace sw { class Filters; } diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 54df7fb8bb57..018eb68a9904 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.hxx @@ -23,7 +23,6 @@ #include <vcl/builder.hxx> #include <vcl/graph.hxx> #include <vcl/menu.hxx> -#include <svl/stritem.hxx> class SwView; class SfxDispatcher; diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 308a240b524c..5ad207982059 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -27,7 +27,9 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <svl/intitem.hxx> #include <vcl/settings.hxx> +#include <svx/pageitem.hxx> #include <svx/svxids.hrc> namespace sw { namespace sidebar { diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index 61d89fb7d6c3..974d0632ab6f 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -19,11 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX #define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX -#include <svx/tbxctl.hxx> +#include <sfx2/tbxctrl.hxx> #include <vcl/button.hxx> -#include <svx/pageitem.hxx> -#include <editeng/sizeitem.hxx> -#include <svl/intitem.hxx> namespace sw { namespace sidebar { diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index bf96a0f7568c..a63480436f95 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -26,20 +26,12 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <i18nutil/paper.hxx> - -#include <svx/pageitem.hxx> #include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> -#include <vcl/ctrl.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/field.hxx> #include <svl/intitem.hxx> -#include <tools/fldunit.hxx> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <svx/spacinglistbox.hxx> diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 94b611d4278a..351b5162edb2 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -25,26 +25,17 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <i18nutil/paper.hxx> - #include <svx/pageitem.hxx> #include <svx/rulritem.hxx> #include <svx/papersizelistbox.hxx> -#include <editeng/sizeitem.hxx> -#include <vcl/ctrl.hxx> #include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/field.hxx> -#include <svl/intitem.hxx> #include <tools/fldunit.hxx> #include <svl/poolitem.hxx> #include <svx/relfld.hxx> #include <memory> -#include <vector> namespace sw { namespace sidebar { diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index de2ceb958ed1..7426ebbd0646 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -26,20 +26,12 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <i18nutil/paper.hxx> - -#include <svx/pageitem.hxx> #include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> -#include <vcl/ctrl.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/field.hxx> #include <svl/intitem.hxx> -#include <tools/fldunit.hxx> #include <svl/poolitem.hxx> #include <svl/eitem.hxx> #include <svx/spacinglistbox.hxx> diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 7c0584facdfe..00914a59a89d 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -32,8 +32,11 @@ #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> #include <svx/pageitem.hxx> +#include <svx/rulritem.hxx> #include <svl/itempool.hxx> #include <svl/intitem.hxx> +#include <svtools/unitconv.hxx> +#include <unotools/viewoptions.hxx> #include <swtypes.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 761f5c7dfdec..fe54b4ecf7dd 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -19,18 +19,11 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX #define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX -#include <tools/fldunit.hxx> -#include <svl/poolitem.hxx> -#include <svx/rulritem.hxx> -#include <unotools/viewoptions.hxx> +#include <sfx2/tbxctrl.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <svtools/unitconv.hxx> -#include <vector> #include <vcl/layout.hxx> -#include <svx/tbxctl.hxx> - #define SWPAGE_NARROW_VALUE 720 #define SWPAGE_NORMAL_VALUE 1136 #define SWPAGE_WIDE_VALUE1 1440 diff --git a/sw/source/uibase/sidebar/PageMarginUtils.hxx b/sw/source/uibase/sidebar/PageMarginUtils.hxx index 7e29cef6d6b4..33408c282630 100644 --- a/sw/source/uibase/sidebar/PageMarginUtils.hxx +++ b/sw/source/uibase/sidebar/PageMarginUtils.hxx @@ -189,4 +189,4 @@ void SetMirrored( long& nPageLeftMargin, long& nPageRightMargin, } } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index d206a6fd8544..1e34a62bc1ab 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX #include <memory> -#include <svx/tbxctl.hxx> +#include <sfx2/tbxctrl.hxx> #include <svx/pageitem.hxx> #include <svx/rulritem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index c5c7a9bbda73..6901d54ea284 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -38,6 +38,7 @@ #include <vcl/settings.hxx> #include <svl/itempool.hxx> #include <svl/intitem.hxx> +#include <svtools/unitconv.hxx> #include <editeng/sizeitem.hxx> namespace diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index f99a4ead5486..e67f624998e4 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -23,8 +23,7 @@ #include <vcl/button.hxx> #include <vcl/field.hxx> -#include <svtools/unitconv.hxx> -#include <svx/tbxctl.hxx> +#include <sfx2/tbxctrl.hxx> #include <vcl/layout.hxx> #include <vector> diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index e62d6c75ba7c..c1c0eaabc96a 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -26,6 +26,7 @@ #include <svx/dlgutil.hxx> #include <svx/rulritem.hxx> #include <svx/drawitem.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index ec317ea96f7b..9b717f7e7cf8 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -26,24 +26,13 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <i18nutil/paper.hxx> - #include <svx/pageitem.hxx> -#include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> -#include <vcl/ctrl.hxx> #include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/field.hxx> #include <svl/intitem.hxx> -#include <tools/fldunit.hxx> #include <svl/poolitem.hxx> -#include <svx/dlgctrl.hxx> #include <svx/xbtmpit.hxx> -#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx index eca0831f851e..215a9de343da 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx @@ -18,26 +18,8 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <sfx2/objsh.hxx> - -#include <svx/pageitem.hxx> -#include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> - -#include <vcl/ctrl.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/field.hxx> -#include <svl/intitem.hxx> -#include <svl/lstner.hxx> - #include <svtools/valueset.hxx> -#include <svx/fntctrl.hxx> - -#include <docstyle.hxx> - namespace sw { namespace sidebar { class StylePresetsPanel : public PanelLayout, diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 39d4c4800654..e0823d0f5782 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -35,6 +35,7 @@ #include <vcl/virdev.hxx> #include <charatr.hxx> #include <charfmt.hxx> +#include <docsh.hxx> #include <docstyle.hxx> #include <fmtcol.hxx> #include <format.hxx> diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx index 6014938a2522..ac78c6c47532 100644 --- a/sw/source/uibase/sidebar/ThemePanel.hxx +++ b/sw/source/uibase/sidebar/ThemePanel.hxx @@ -17,27 +17,13 @@ #include <sfx2/sidebar/ControllerItem.hxx> -#include <svx/pageitem.hxx> -#include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> - -#include <vcl/ctrl.hxx> -#include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <vcl/toolbox.hxx> #include <vcl/lstbox.hxx> -#include <vcl/field.hxx> -#include <svl/intitem.hxx> -#include <svl/lstner.hxx> #include <svtools/valueset.hxx> -#include <svx/fntctrl.hxx> - #include <svx/ColorSets.hxx> -#include <docsh.hxx> - namespace sw { namespace sidebar { class ThemePanel : public PanelLayout, diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index 8ce00d68e0ac..66bca6ceed92 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -21,7 +21,6 @@ #include <svx/sidebar/PanelLayout.hxx> #include <vcl/button.hxx> -#include <vcl/image.hxx> #include <vcl/fixed.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index fd39dd56a01b..e5b47fb2f35d 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_TABLE_TABLEPG_HXX #define INCLUDED_SW_SOURCE_UIBASE_TABLE_TABLEPG_HXX #include <sfx2/tabdlg.hxx> -#include <actctrl.hxx> #include <prcntfld.hxx> #include <swtypes.hxx> #include <svx/frmdirlbox.hxx> diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx index 3ee98bc38f0d..c9d300039127 100644 --- a/sw/source/uibase/uiview/viewfunc.hxx +++ b/sw/source/uibase/uiview/viewfunc.hxx @@ -18,7 +18,10 @@ */ #ifndef INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEWFUNC_HXX #define INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEWFUNC_HXX -#include <tools/solar.h> + +#include <vcl/outdev.hxx> + +#include <IDocumentDeviceAccess.hxx> class ImageButton; class Point; diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index ab4cc5f2311c..10ef572cb272 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SW_SOURCE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX #include <comphelper/MasterPropertySet.hxx> -#include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weak.hxx> diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 5a371d65665b..1d2157efff77 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/uno/Reference.h> #include <cppuhelper/implbase.hxx> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits