Remove pass-through header svtools/inc/svtools/txtcmp.hxx

Change-Id: I605ae778e57a12588dca274a4ee34a018004034e

Remove pass-through header sfx2/inc/sfx2/imgdef.hxx

Change-Id: I9a5ebabefccdd63b55d64aec26488542d0d362e3

Remove pass-through header xmloff/inc/xmloff/xmlcnitm.hxx

Change-Id: If880679499daee2f77d1f6e148dba963d09bbb9c
Reviewed-on: https://gerrit.libreoffice.org/3477
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

22 files changed, 17 insertions, 100 deletions

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index deefbe683db7..442f3d822cb5 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -965,7 +965,7 @@
 #include <xmloff/txtparae.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlaustp.hxx>
-#include <xmloff/xmlcnitm.hxx>
+#include <editeng/xmlcnitm.hxx>
 #include <xmloff/xmlerror.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimppr.hxx>
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index ec3a741bab32..2248f903f59a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -67,7 +67,7 @@
 #include <xmloff/families.hxx>
 #include <xmloff/numehelp.hxx>
 #include <xmloff/txtparae.hxx>
-#include <xmloff/xmlcnitm.hxx>
+#include <editeng/xmlcnitm.hxx>
 #include <xmloff/xmlerror.hxx>
 #include <xmloff/XMLEventExport.hxx>
 
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 0b49d4b16ae9..0e22e48dfd0b 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/htmlmode.hxx,sfx2/htmlmode.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/infobar.hxx,sfx2/infobar.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx))
diff --git a/sfx2/inc/sfx2/imgdef.hxx b/sfx2/inc/sfx2/imgdef.hxx
deleted file mode 100644
index b529974f3a73..000000000000
--- a/sfx2/inc/sfx2/imgdef.hxx
+++ /dev/null
@@ -1,26 +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 _SFX_IMGDEF_HXX
-#define _SFX_IMGDEF_HXX
-
-#include <svtools/imgdef.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 635139b75964..3b285faf6593 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -23,7 +23,7 @@
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
 #include <sfx2/shell.hxx>
-#include <sfx2/imgdef.hxx>
+#include <svtools/imgdef.hxx>
 #include <sal/types.h>
 #include <tools/fldunit.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 85a163aa503c..527db6f17d24 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -161,7 +161,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpanel.hx
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/toolpanel/toolpaneldeck.hxx,svtools/toolpanel/toolpaneldeck.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/transfer.hxx,svtools/transfer.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/treelist.hxx,svtools/treelist.hxx))
-$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/txtcmp.hxx,svtools/txtcmp.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unitconv.hxx,svtools/unitconv.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/unoevent.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx))
diff --git a/svtools/inc/svtools/txtcmp.hxx b/svtools/inc/svtools/txtcmp.hxx
deleted file mode 100644
index fbfaa8d84fe6..000000000000
--- a/svtools/inc/svtools/txtcmp.hxx
+++ /dev/null
@@ -1,26 +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 _TXTCMP_HXX
-#define _TXTCMP_HXX
-
-#include <unotools/textsearch.hxx>
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 31ee52c31963..46e6034c5b77 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -353,7 +353,7 @@
 #include <svtools/stdctrl.hxx>
 #include <svtools/stdmenu.hxx>
 #include <svtools/svlbitm.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <svtools/valueset.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <toolkit/helper/externallock.hxx>
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index f7b71ec62ff4..c88b74238ae9 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -35,7 +35,7 @@
 #endif
 #include <vcl/tabctrl.hxx>
 #include <tools/datetime.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include "svtools/treelistentry.hxx"
 #include "svx/svxdllapi.h"
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 01b1a8f33c7d..b201d8dff1d6 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -23,7 +23,7 @@
 #include <tools/shl.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <svtools/svlbitm.hxx>
 #include "svtools/viewdataentry.hxx"
 #include <unotools/charclass.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 4957e1a4bcad..5f9a62f47f51 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -776,7 +776,7 @@
 #include <svtools/svtresid.hxx>
 #include <svtools/templdlg.hxx>
 #include <svtools/transfer.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svtools/xwindowitem.hxx>
@@ -1095,7 +1095,7 @@
 #include <xmloff/xformsexport.hxx>
 #include <xmloff/xformsimport.hxx>
 #include <xmloff/xmlaustp.hxx>
-#include <xmloff/xmlcnitm.hxx>
+#include <editeng/xmlcnitm.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlimp.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 7bd4337ff35f..d4f878185fc3 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/string.hxx>
 #include <svl/fstathelper.hxx>
 
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 
 #include <sfx2/docfile.hxx>
 
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 83dd971fefc3..5796c33b1bed 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -20,7 +20,7 @@
 #ifndef _PAMTYP_HXX
 #define _PAMTYP_HXX
 
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <pam.hxx>
 #include <node.hxx>
 #include <tools/string.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index e2f223d3d8fb..d3d5ed5519d3 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -100,7 +100,7 @@
 #include <vcl/svapp.hxx>
 #include <sfx2/printer.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <xmloff/xmlcnitm.hxx>
+#include <editeng/xmlcnitm.hxx>
 #include <poolfmt.hxx>
 #include <pagedesc.hxx>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/ui/index/idxmrk.cxx
index ec44d2486a55..19fae85694b9 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/ui/index/idxmrk.cxx
@@ -30,7 +30,7 @@
 #include <vcl/msgbox.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/eitem.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index c5b5abf7a183..79948ae44c93 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -33,7 +33,7 @@
 #include <vcl/msgbox.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/eitem.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <svl/itemset.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 1405cd46d190..194fd2ee3ef3 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -35,7 +35,7 @@
 #include <svl/stritem.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/undo.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <svl/eitem.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/saveopt.hxx>
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index 981d7df778cc..a67e93c50bd3 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -53,7 +53,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
 #include <editeng/lrspitem.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include "editeng/unolingu.hxx"
 #include <vcl/msgbox.hxx>
 #include <editeng/tstpitem.hxx>
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 3778429c7235..fce4d50f65f7 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -30,7 +30,7 @@
 #include <svl/whiter.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/stritem.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <svl/itempool.hxx>
 #include <svl/eitem.hxx>
 #include <svl/srchitem.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 64ca3060ae97..d49436b31823 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -56,7 +56,7 @@
 #include <unodraw.hxx>
 #include <svl/eitem.hxx>
 #include <pagedesc.hxx>
-#include <svtools/txtcmp.hxx>
+#include <unotools/textsearch.hxx>
 #include <unocrsr.hxx>
 #include <unofieldcoll.hxx>
 #include <unoidxcoll.hxx>
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
index cc4a1cea2152..50ffee36c359 100644
--- a/xmloff/Package_inc.mk
+++ b/xmloff/Package_inc.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsexport.hxx,xmloff/
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xformsimport.hxx,xmloff/xformsimport.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlaustp.hxx,xmloff/xmlaustp.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnimp.hxx,xmloff/xmlcnimp.hxx))
-$(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlcnitm.hxx,xmloff/xmlcnitm.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlement.hxx,xmloff/xmlement.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlerror.hxx,xmloff/xmlerror.hxx))
 $(eval $(call gb_Package_add_file,xmloff_inc,inc/xmloff/xmlevent.hxx,xmloff/xmlevent.hxx))
diff --git a/xmloff/inc/xmloff/xmlcnitm.hxx b/xmloff/inc/xmloff/xmlcnitm.hxx
deleted file mode 100644
index d81468642f0d..000000000000
--- a/xmloff/inc/xmloff/xmlcnitm.hxx
+++ /dev/null
@@ -1,28 +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 _XMLOFF_XMLCNITM_HXX
-#define _XMLOFF_XMLCNITM_HXX
-
-// This has class been moved to editeng, or why was there a dupe?
-#include <editeng/xmlcnitm.hxx>
-
-#endif //  _XMLOFF_XMLCNITM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */