7 files changed, 24 insertions, 44 deletions
diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx
index 368ed1ccf100..bb893fd3ed8a 100644
--- a/include/svx/xattr.hxx
+++ b/include/svx/xattr.hxx
@@ -25,7 +25,6 @@
 #include <svx/xhatch.hxx>
 #include <svx/xlineit.hxx>
 #include <svx/xfillit.hxx>
-#include <svx/xtextit.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/xfillit0.hxx>
 #include <svx/xtextit0.hxx>
diff --git a/include/svx/xtextit.hxx b/include/svx/xtextit.hxx
deleted file mode 100644
index a3cd2a9b8f3c..000000000000
--- a/include/svx/xtextit.hxx
+++ /dev/null
@@ -1,40 +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_XTEXTIT_HXX
-#define INCLUDED_SVX_XTEXTIT_HXX
-
-#include <svx/xenum.hxx>
-#include <svl/metitem.hxx>
-#include <svl/eitem.hxx>
-#include <svx/xit.hxx>
-#include <svx/xcolit.hxx>
-
-#include <svx/xftadit.hxx>
-#include <svx/xftdiit.hxx>
-#include <svx/xftstit.hxx>
-#include <svx/xftmrit.hxx>
-#include <svx/xftouit.hxx>
-#include <svx/xftshit.hxx>
-#include <svx/xftshcit.hxx>
-#include <svx/xftshxy.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 74813ca502c9..096cbea75ecc 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7479,7 +7479,6 @@ include/svx/xpoly.hxx
 include/svx/xpool.hxx
 include/svx/xsflclit.hxx
 include/svx/xtable.hxx
-include/svx/xtextit.hxx
 include/svx/xtextit0.hxx
 include/svx/zoom_def.hxx
 include/svx/zoomctrl.hxx
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index ac8e68e353ad..b2f37301857d 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -25,7 +25,14 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdocirc.hxx>
-#include <svx/xtextit.hxx>
+#include <svx/xftadit.hxx>
+#include <svx/xftdiit.hxx>
+#include <svx/xftstit.hxx>
+#include <svx/xftmrit.hxx>
+#include <svx/xftouit.hxx>
+#include <svx/xftshit.hxx>
+#include <svx/xftshcit.hxx>
+#include <svx/xftshxy.hxx>
 
 #include <svx/dlgutil.hxx>
 
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index c887ff06ab5d..98836adc92e5 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -27,7 +27,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <algorithm>
-#include <svx/xtextit.hxx>
 #include <svx/xftshtit.hxx>
 #include <vcl/virdev.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index db10ce427596..eab4172a1b91 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -54,6 +54,14 @@
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <svx/svdmodel.hxx>
+#include <svx/xftdiit.hxx>
+#include <svx/xftstit.hxx>
+#include <svx/xftmrit.hxx>
+#include <svx/xftouit.hxx>
+#include <svx/xftshit.hxx>
+#include <svx/xftshcit.hxx>
+#include <svx/xftshxy.hxx>
+#include <svx/xftadit.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index cb76275a7625..62af4864922e 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -37,6 +37,14 @@
 #include <svx/svdattr.hxx>
 #include <svx/svxids.hrc>
 #include <svl/itemset.hxx>
+#include <svx/xftadit.hxx>
+#include <svx/xftdiit.hxx>
+#include <svx/xftstit.hxx>
+#include <svx/xftmrit.hxx>
+#include <svx/xftouit.hxx>
+#include <svx/xftshit.hxx>
+#include <svx/xftshcit.hxx>
+#include <svx/xftshxy.hxx>
 
 XOutdevItemPool::XOutdevItemPool(SfxItemPool* _pMaster)
     : SfxItemPool("XOutdevItemPool", SDRATTR_START, SDRATTR_END, nullptr, nullptr)