cui/source/dialogs/cuiimapwnd.cxx | 1
cui/source/inc/cuitabarea.hxx | 1
cui/source/tabpages/backgrnd.cxx | 1
cui/source/tabpages/tparea.cxx | 4 ++
cui/source/tabpages/tpbitmap.cxx | 1
cui/source/tabpages/tpcolor.cxx | 1
cui/source/tabpages/tpgradnt.cxx | 1
cui/source/tabpages/tphatch.cxx | 2 +
cui/source/tabpages/tppattern.cxx | 1
cui/source/tabpages/tpshadow.cxx | 4 ++
cui/source/tabpages/tptrans.cxx | 5 ++
filter/source/msfilter/msdffimp.cxx | 4 ++
filter/source/msfilter/svdfppt.cxx | 2 +
include/svx/xattr.hxx | 1
include/svx/xfillit.hxx | 42 ---------------------
reportdesign/source/ui/report/ReportController.cxx | 7 +++
sd/source/ui/sidebar/SlideBackground.cxx | 1
sd/source/ui/view/sdview4.cxx | 2 -
solenv/clang-format/blacklist | 1
svx/source/dialog/contwnd.cxx | 2 -
svx/source/dialog/imapwnd.cxx | 2 -
svx/source/engine3d/obj3d.cxx | 1
svx/source/tbxctrls/colrctrl.cxx | 1
svx/source/tbxctrls/fillctrl.cxx | 4 ++
svx/source/xoutdev/xattr.cxx | 6 +++
svx/source/xoutdev/xattrbmp.cxx | 1
svx/source/xoutdev/xpool.cxx | 6 +++
sw/source/core/frmedt/fecopy.cxx | 2 -
sw/source/core/frmedt/feshview.cxx | 1
sw/source/filter/html/htmldrawreader.cxx | 2 -
sw/source/filter/html/htmldrawwriter.cxx | 2 -
sw/source/filter/ww8/ww8graf.cxx | 3 +
sw/source/uibase/sidebar/PageStylesPanel.cxx | 4 ++
sw/source/uibase/sidebar/PageStylesPanel.hxx | 1
sw/source/uibase/uiview/viewtab.cxx | 5 ++
35 files changed, 67 insertions(+), 58 deletions(-)
New commits:
commit 7722ffd1f50ee431dfc501c4f0fecd40eb9046d3
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Fri Apr 26 01:59:08 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Apr 29 10:11:13 2019 +0200
tdf#62699 Drop pass-through header file include/svx/xfillit.hxx
Change-Id: I6598d81b166486f3c48b119cc136b9f6e6c2a12c
Reviewed-on: https://gerrit.libreoffice.org/71336
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/cui/source/dialogs/cuiimapwnd.cxx
b/cui/source/dialogs/cuiimapwnd.cxx
index 516b35c7e55c..7634ea091aed 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -34,7 +34,6 @@
#include <svx/xfltrit.hxx>
#include <svx/svdpagv.hxx>
#include <svl/urihelper.hxx>
-#include <svx/xfillit.hxx>
#include <svx/xlineit.hxx>
#include <sot/formats.hxx>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 8e2a6e9b29c3..4b2dd2f3ac84 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -22,7 +22,6 @@
#include <svtools/valueset.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/xfillit0.hxx>
-#include <svx/xfillit.hxx>
#include <svx/tabarea.hxx>
#include <svx/hexcolorcontrol.hxx>
#include <svx/SvxColorValueSet.hxx>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index c2166e87c275..1bec48871dfb 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -44,6 +44,7 @@
#include <sfx2/opengrf.hxx>
#include <svx/svxerr.hxx>
#include <svx/drawitem.hxx>
+#include <svx/xflclit.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
#include <svtools/controldims.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 7204e5f72b0a..43c078c87285 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -32,6 +32,10 @@
#include <svx/xtable.hxx>
#include <svx/xlineit0.hxx>
#include <svx/drawitem.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <cuitabarea.hxx>
#include <dlgname.hxx>
#include <svx/dlgutil.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 4aad7f105476..fcab3c124d03 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -22,6 +22,7 @@
#include <tools/urlobj.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
#include <svx/xattr.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 911bbf748060..a938bacbe6ff 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <strings.hrc>
+#include <svx/xflclit.hxx>
#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 37a46fc59ea5..abc476b14c86 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <strings.hrc>
+#include <svx/xflgrit.hxx>
#include <svx/colorbox.hxx>
#include <svx/xattr.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 09c35101ff2e..8b59d3f2f353 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -30,6 +30,8 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <strings.hrc>
+#include <svx/xflhtit.hxx>
+#include <svx/xflclit.hxx>
#include <svx/colorbox.hxx>
#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
diff --git a/cui/source/tabpages/tppattern.cxx
b/cui/source/tabpages/tppattern.cxx
index aec205d9b91e..65c1a207d4d5 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -37,6 +37,7 @@
#include <svx/strings.hrc>
#include <strings.hrc>
+#include <svx/xbtmpit.hxx>
#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index f73f6b221149..6c629122aca7 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -24,6 +24,10 @@
#include <svx/svxids.hrc>
#include <svtools/unitconv.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/svdattr.hxx>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 4fba49788ccc..2092d6830e28 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -25,6 +25,11 @@
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
+#include <svx/xflclit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xflbckit.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 0f0e52aab0d3..82a1abc20407 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -77,6 +77,10 @@
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/module.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xsflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflftrit.hxx>
#include <svx/sdgcpitm.hxx>
#include <svx/sdgmoitm.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index f42149f11d98..b714abf001ea 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -39,6 +39,8 @@
#include <com/sun/star/drawing/BitmapMode.hpp>
#include <unotools/streamwrap.hxx>
#include <filter/msfilter/svdfppt.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/xpoly.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdmodel.hxx>
diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx
index bb893fd3ed8a..ee814da03efe 100644
--- a/include/svx/xattr.hxx
+++ b/include/svx/xattr.hxx
@@ -24,7 +24,6 @@
#include <svx/xgrad.hxx>
#include <svx/xhatch.hxx>
#include <svx/xlineit.hxx>
-#include <svx/xfillit.hxx>
#include <svx/xlineit0.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xtextit0.hxx>
diff --git a/include/svx/xfillit.hxx b/include/svx/xfillit.hxx
deleted file mode 100644
index bd4fa2d703de..000000000000
--- a/include/svx/xfillit.hxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_XFILLIT_HXX
-#define INCLUDED_SVX_XFILLIT_HXX
-
-#include <vcl/bitmap.hxx>
-#include <svx/xcolit.hxx>
-#include <svx/xgrad.hxx>
-#include <svx/xhatch.hxx>
-#include <svx/xenum.hxx>
-#include <svl/eitem.hxx>
-
-#include <svx/xflclit.hxx>
-#include <svx/xsflclit.hxx>
-#include <svx/xflgrit.hxx>
-#include <svx/xflhtit.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/xflftrit.hxx>
-
-class XGradient;
-class XOBitmap;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 5e8e7e7d3b36..4a1866316805 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -85,7 +85,12 @@
#include <svx/svxids.hrc>
#include <svx/svdobj.hxx>
#include <svx/dataaccessdescriptor.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xsflclit.hxx>
#include <svx/xflbckit.hxx>
#include <svx/xflbmpit.hxx>
#include <svx/xflbmsli.hxx>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index e140049a0f2e..0e8fe07db9a3 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -48,6 +48,7 @@
#include <sfx2/sidebar/Theme.hxx>
#include <app.hrc>
#include <editeng/paperinf.hxx>
+#include <svx/xflgrit.hxx>
#include <svx/rulritem.hxx>
#include <svx/svxids.hrc>
#include <svx/xflclit.hxx>
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 5e46e0579bc8..05233c4a52af 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -32,7 +32,7 @@
#include <vcl/weld.hxx>
#include <svl/urlbmk.hxx>
#include <svx/svdpagv.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/svdundo.hxx>
#include <svx/xoutbmp.hxx>
#include <svx/svdograf.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 43495f762194..80a084c9b117 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7426,7 +7426,6 @@ include/svx/xcolit.hxx
include/svx/xdash.hxx
include/svx/xdef.hxx
include/svx/xenum.hxx
-include/svx/xfillit.hxx
include/svx/xfillit0.hxx
include/svx/xflasit.hxx
include/svx/xflbckit.hxx
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 5b2d4b601fb6..6ae42a7dee69 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -23,7 +23,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdopath.hxx>
#include <svx/xfltrit.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svx/sdrpaintwindow.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 6aa691e4b044..cbb58f1c8161 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -36,7 +36,7 @@
#include <svx/xfltrit.hxx>
#include <svx/svdpagv.hxx>
#include <svl/urihelper.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
#include <svx/xlineit.hxx>
#include <sfx2/evntconf.hxx>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index ed27d7d6953d..4ddce132a7fe 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -40,7 +40,6 @@
#include <vcl/settings.hxx>
#include <svx/xlnclit.hxx>
#include <svl/metitem.hxx>
-#include <svx/xfillit.hxx>
#include <svx/xlnwtit.hxx>
#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 8cc934e5aefd..45c52420ad78 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -34,6 +34,7 @@
#include <svx/svdview.hxx>
#include <svx/drawitem.hxx>
+#include <svx/xflclit.hxx>
#include <editeng/colritem.hxx>
#include <svx/xattr.hxx>
#include <svx/xtable.hxx>
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index c6a8c35310b4..c0ccab558a4e 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -38,6 +38,10 @@
#include <svx/xtable.hxx>
#include <svx/fillctrl.hxx>
#include <svx/itemwin.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <memory>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index eab4172a1b91..d181639661e1 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -48,6 +48,12 @@
#include <svx/xattr.hxx>
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xsflclit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <editeng/itemtype.hxx>
#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index a7b204217638..648a0ba8578f 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -34,6 +34,7 @@
#include <svx/unoapi.hxx>
#include <svx/svdmodel.hxx>
#include <svx/xbitmap.hxx>
+#include <svx/xbtmpit.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <vcl/bitmapaccess.hxx>
#include <vcl/BitmapTools.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 62af4864922e..f569d10c3bc8 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -23,6 +23,12 @@
#include <svx/xftshtit.hxx>
#include <svx/xflboxy.hxx>
#include <svx/xflbstit.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xsflclit.hxx>
#include <svx/xtable.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xfltrit.hxx>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index b08cbf4fb2fd..cd6a9ba15c79 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -32,7 +32,7 @@
#include <editeng/brushitem.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdouno.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdogrp.hxx>
#include <svx/xoutbmp.hxx>
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index 84d5bbb8bc1f..8dcd0c9390de 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -29,7 +29,6 @@
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
#include <svx/sxciaitm.hxx>
-#include <svx/xfillit.hxx>
#include <svx/svdocapt.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlnstwit.hxx>
diff --git a/sw/source/filter/html/htmldrawreader.cxx
b/sw/source/filter/html/htmldrawreader.cxx
index 0b1bde84b298..cfaa9ece5011 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -26,7 +26,7 @@
#include <svx/svdotext.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/outliner.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/filter/html/htmldrawwriter.cxx
b/sw/source/filter/html/htmldrawwriter.cxx
index 9b4f06e029e5..15615ad29698 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -26,7 +26,7 @@
#include <svx/svdotext.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/outliner.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index d3d8154df354..7db149746c7a 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -27,7 +27,8 @@
#include <editeng/lrspitem.hxx>
#include <editeng/udlnitem.hxx>
#include <svx/xlineit.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdocapt.hxx>
#include <svx/sxctitm.hxx>
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx
b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index ae9a692dbe4e..e62d6c75ba7c 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -26,6 +26,10 @@
#include <svx/dlgutil.hxx>
#include <svx/rulritem.hxx>
#include <svx/drawitem.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/SvxNumOptionsTabPageHelper.hxx>
#include "PageStylesPanel.hxx"
#include <sfx2/sidebar/ControlFactory.hxx>
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx
b/sw/source/uibase/sidebar/PageStylesPanel.hxx
index 27890af084e8..51adff841cd9 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.hxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx
@@ -42,7 +42,6 @@
#include <tools/fldunit.hxx>
#include <svl/poolitem.hxx>
#include <svx/dlgctrl.hxx>
-#include <svx/xfillit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/itemwin.hxx>
#include <svx/pagenumberlistbox.hxx>
diff --git a/sw/source/uibase/uiview/viewtab.cxx
b/sw/source/uibase/uiview/viewtab.cxx
index 39e056cc0b2f..fd19f78f47c5 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -21,7 +21,10 @@
#include <uitool.hxx>
#include <sfx2/app.hxx>
#include <svx/rulritem.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xbtmpit.hxx>
#include <svx/xfillit0.hxx>
#include <editeng/tstpitem.hxx>
#include <sfx2/request.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
