tdf#62699 Drop pass-through header file include/svx/xsetit.hxx

Change-Id: Id750f663389be36c669756e4bdd1e4e01be48199
Reviewed-on: https://gerrit.libreoffice.org/71327
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 47 insertions, 49 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 016b976ae374..8e2a6e9b29c3 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -21,7 +21,6 @@
 
 #include <svtools/valueset.hxx>
 #include <svx/dlgctrl.hxx>
-#include <svx/xsetit.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xfillit.hxx>
 #include <svx/tabarea.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 78a1b49f00ce..43563e6762ec 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -31,6 +31,13 @@
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xflbmsxy.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xflbstit.hxx>
+#include <svx/xflbmsli.hxx>
+#include <svx/xflbmpit.hxx>
+#include <svx/xflboxy.hxx>
+#include <svx/xflbtoxy.hxx>
 #include <cuitabarea.hxx>
 #include <dlgname.hxx>
 #include <dialmgr.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 8fdeb16dd5b6..37a46fc59ea5 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -34,6 +34,7 @@
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xgrscit.hxx>
 #include <cuitabarea.hxx>
 #include <defdlgname.hxx>
 #include <dlgname.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 194a23bd7917..2d9279d6ee55 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -35,6 +35,7 @@
 #include <svx/xpool.hxx>
 #include <svx/xtable.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xflbckit.hxx>
 #include <cuitabarea.hxx>
 #include <defdlgname.hxx>
 #include <dlgname.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8b65a270f6ab..9024670b64d6 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -42,6 +42,8 @@
 #include <svx/svdview.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/numvset.hxx>
+#include <svx/xlntrit.hxx>
+#include <svx/xfltrit.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <sfx2/objsh.hxx>
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 0a73dfdf3e52..aec205d9b91e 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -42,6 +42,7 @@
 #include <svx/xtable.hxx>
 #include <svx/xoutbmp.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xflbmtit.hxx>
 #include <cuitabarea.hxx>
 #include <defdlgname.hxx>
 #include <dlgname.hxx>
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6b56087c2e27..9d99c6e18542 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -26,6 +26,7 @@
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xfltrit.hxx>
 #include <cuitabarea.hxx>
 #include <svx/dlgutil.hxx>
 #include <cuitabline.hxx>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 0ce7026e55c3..c7dbbd86439b 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -31,6 +31,7 @@
 #include <svx/xtable.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/drawitem.hxx>
+#include <svx/xfltrit.hxx>
 #include <cuitabarea.hxx>
 #include <dlgname.hxx>
 #include <svx/dlgutil.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f6e29de2e142..389907baed39 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -94,6 +94,12 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdopath.hxx>
+#include <svx/xlntrit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xfltrit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xflbmsxy.hxx>
+#include <svx/xflbmsli.hxx>
 #include <editeng/frmdir.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index d6ad2b72f11c..f42149f11d98 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -52,6 +52,9 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdotable.hxx>
+#include <svx/xflbstit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xfltrit.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/numdef.hxx>
 #include <svx/svdattr.hxx>
diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx
index 1c0a021b6ab9..ed9a8bb2f20a 100644
--- a/include/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
@@ -23,7 +23,6 @@
 #include <svx/svdpage.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xlineit.hxx>
-#include <svx/xsetit.hxx>
 #include <svx/dlgctrl.hxx>
 #include <vcl/menubtn.hxx>
 
diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx
index f8c7d6d34719..368ed1ccf100 100644
--- a/include/svx/xattr.hxx
+++ b/include/svx/xattr.hxx
@@ -29,7 +29,6 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xtextit0.hxx>
-#include <svx/xsetit.hxx>
 #include <svx/xlinjoit.hxx>
 #include <svx/xlncapit.hxx>
 
diff --git a/include/svx/xsetit.hxx b/include/svx/xsetit.hxx
deleted file mode 100644
index 69d4e226f388..000000000000
--- a/include/svx/xsetit.hxx
+++ /dev/null
@@ -1,45 +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_XSETIT_HXX
-#define INCLUDED_SVX_XSETIT_HXX
-
-#include <svx/xit.hxx>
-#include <svl/metitem.hxx>
-#include <svl/eitem.hxx>
-#include <svx/rectenum.hxx>
-
-#include <svx/xlnasit.hxx>
-#include <svx/xflasit.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/xftshtit.hxx>
-#include <svx/xgrscit.hxx>
-#include <svx/xflbmtit.hxx>
-#include <svx/xflbmpit.hxx>
-#include <svx/xflbmsxy.hxx>
-#include <svx/xflbmsli.hxx>
-#include <svx/xflbtoxy.hxx>
-#include <svx/xflbstit.hxx>
-#include <svx/xflboxy.hxx>
-#include <svx/xflbckit.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 50f21b920c39..74813ca502c9 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7477,7 +7477,6 @@ include/svx/xmlsecctrl.hxx
 include/svx/xoutbmp.hxx
 include/svx/xpoly.hxx
 include/svx/xpool.hxx
-include/svx/xsetit.hxx
 include/svx/xsflclit.hxx
 include/svx/xtable.hxx
 include/svx/xtextit.hxx
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 2469c66981b7..af9181a9dd96 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -26,6 +26,18 @@
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/xattr.hxx>
+#include <svx/xlntrit.hxx>
+#include <svx/xfltrit.hxx>
+#include <svx/xftshtit.hxx>
+#include <svx/xgrscit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xflbmpit.hxx>
+#include <svx/xflbmsxy.hxx>
+#include <svx/xflbmsli.hxx>
+#include <svx/xflbtoxy.hxx>
+#include <svx/xflbstit.hxx>
+#include <svx/xflboxy.hxx>
+#include <svx/xflbckit.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 555df737be18..cb76275a7625 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -19,7 +19,19 @@
 
 #include <sal/config.h>
 
+#include <svx/xflbckit.hxx>
+#include <svx/xftshtit.hxx>
+#include <svx/xflboxy.hxx>
+#include <svx/xflbstit.hxx>
 #include <svx/xtable.hxx>
+#include <svx/xlntrit.hxx>
+#include <svx/xfltrit.hxx>
+#include <svx/xgrscit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xflbmpit.hxx>
+#include <svx/xflbmsxy.hxx>
+#include <svx/xflbmsli.hxx>
+#include <svx/xflbtoxy.hxx>
 #include <svx/xattr.hxx>
 #include <svx/xpool.hxx>
 #include <svx/svdattr.hxx>