tdf#42949 Fix IWYU warnings in include/test

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.

Change-Id: I527f7c2cf2660a758b13eabb4c444ff79ae35f8c
Reviewed-on: https://gerrit.libreoffice.org/75186
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

25 files changed, 16 insertions, 27 deletions

diff --git a/include/test/container/xnameaccess.hxx b/include/test/container/xnameaccess.hxx
index 6ff525917380..960cf67822b9 100644
--- a/include/test/container/xnameaccess.hxx
+++ b/include/test/container/xnameaccess.hxx
@@ -14,7 +14,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <rtl/string.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest
diff --git a/include/test/drawing/xshapedescriptor.hxx b/include/test/drawing/xshapedescriptor.hxx
index cb7c37e3a5ba..2c99e7e9c197 100644
--- a/include/test/drawing/xshapedescriptor.hxx
+++ b/include/test/drawing/xshapedescriptor.hxx
@@ -14,7 +14,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <test/testdllapi.hxx>
-#include <rtl/string.hxx>
 
 namespace apitest
 {
diff --git a/include/test/helper/form.hxx b/include/test/helper/form.hxx
index d84794cc5b6d..0fbcd2c7b06a 100644
--- a/include/test/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -15,7 +15,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <rtl/string.hxx>
 #include <sal/config.h>
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
diff --git a/include/test/helper/shape.hxx b/include/test/helper/shape.hxx
index e4322bec1357..341a9fad93fc 100644
--- a/include/test/helper/shape.hxx
+++ b/include/test/helper/shape.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_TEST_HELPER_SHAPE_HXX
 #define INCLUDED_TEST_HELPER_SHAPE_HXX
 
-#include <rtl/string.hxx>
 #include <sal/config.h>
 #include <sal/types.h>
 #include <test/testdllapi.hxx>
diff --git a/include/test/helper/transferable.hxx b/include/test/helper/transferable.hxx
index 280b28ad5006..d0454bc6e410 100644
--- a/include/test/helper/transferable.hxx
+++ b/include/test/helper/transferable.hxx
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <rtl/string.hxx>
diff --git a/include/test/lang/xcomponent.hxx b/include/test/lang/xcomponent.hxx
index fdbeccc6cf7b..9314749fbc52 100644
--- a/include/test/lang/xcomponent.hxx
+++ b/include/test/lang/xcomponent.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_TEST_LANG_XCOMPONENT_HXX
 #define INCLUDED_TEST_LANG_XCOMPONENT_HXX
 
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 
diff --git a/include/test/lang/xserviceinfo.hxx b/include/test/lang/xserviceinfo.hxx
index 86a92480d970..14ce4eaaaa61 100644
--- a/include/test/lang/xserviceinfo.hxx
+++ b/include/test/lang/xserviceinfo.hxx
@@ -16,7 +16,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <rtl/string.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest
diff --git a/include/test/sheet/cellarealink.hxx b/include/test/sheet/cellarealink.hxx
index 6eff944ae7be..eb3a13547c0a 100644
--- a/include/test/sheet/cellarealink.hxx
+++ b/include/test/sheet/cellarealink.hxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <test/testdllapi.hxx>
-#include <rtl/string.hxx>
 
 namespace apitest
 {
diff --git a/include/test/sheet/functiondescription.hxx b/include/test/sheet/functiondescription.hxx
index 4e3128bcaaaf..bfe719bc5972 100644
--- a/include/test/sheet/functiondescription.hxx
+++ b/include/test/sheet/functiondescription.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_TEST_SHEET_FUNCTIONDESCRIPTION_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <test/testdllapi.hxx>
diff --git a/include/test/sheet/xprintareas.hxx b/include/test/sheet/xprintareas.hxx
index fa9a98728198..b3edbeb7dcd9 100644
--- a/include/test/sheet/xprintareas.hxx
+++ b/include/test/sheet/xprintareas.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_TEST_SHEET_XPRINTAREAS_HXX
 #define INCLUDED_TEST_SHEET_XPRINTAREAS_HXX
 
-#include <com/sun/star/sheet/XPrintAreas.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest {
diff --git a/include/test/sheet/xsheetannotation.hxx b/include/test/sheet/xsheetannotation.hxx
index 326e1b532f9b..c12106209f8b 100644
--- a/include/test/sheet/xsheetannotation.hxx
+++ b/include/test/sheet/xsheetannotation.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_TEST_SHEET_XSHEETANNOTATION_HXX
 #define INCLUDED_TEST_SHEET_XSHEETANNOTATION_HXX
 
-#include <rtl/ustring.hxx>
 #include <com/sun/star/sheet/XSheetAnnotation.hpp>
 #include <test/testdllapi.hxx>
 
diff --git a/include/test/sheet/xsheetoutline.hxx b/include/test/sheet/xsheetoutline.hxx
index 2a7771ac7623..f477b188257d 100644
--- a/include/test/sheet/xsheetoutline.hxx
+++ b/include/test/sheet/xsheetoutline.hxx
@@ -10,8 +10,7 @@
 #ifndef INCLUDED_TEST_SHEET_XSHEETOUTLINE_HXX
 #define INCLUDED_TEST_SHEET_XSHEETOUTLINE_HXX
 
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XSheetOutline.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest {
diff --git a/include/test/sheet/xsheetpagebreak.hxx b/include/test/sheet/xsheetpagebreak.hxx
index 3ae64b650a4f..be8b2ff0a072 100644
--- a/include/test/sheet/xsheetpagebreak.hxx
+++ b/include/test/sheet/xsheetpagebreak.hxx
@@ -10,8 +10,7 @@
 #ifndef INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX
 #define INCLUDED_TEST_SHEET_XSHEETPAGEBREAK_HXX
 
-#include <rtl/ustring.hxx>
-#include <com/sun/star/sheet/XSheetPageBreak.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest {
diff --git a/include/test/sheet/xspreadsheetdocument.hxx b/include/test/sheet/xspreadsheetdocument.hxx
index 76dd7ba2d1c8..ff60815d33dd 100644
--- a/include/test/sheet/xspreadsheetdocument.hxx
+++ b/include/test/sheet/xspreadsheetdocument.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_TEST_SHEET_XSPREADSHEETDOCUMENT_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <test/testdllapi.hxx>
 
 namespace apitest {
 
diff --git a/include/test/sheet/xsubtotalcalculatable.hxx b/include/test/sheet/xsubtotalcalculatable.hxx
index 4c5202b16dd8..11f822b6b15f 100644
--- a/include/test/sheet/xsubtotalcalculatable.hxx
+++ b/include/test/sheet/xsubtotalcalculatable.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_TEST_SHEET_XSUBTOTALCALCULATABLE_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <test/testdllapi.hxx>
 
diff --git a/include/test/table/xcellrange.hxx b/include/test/table/xcellrange.hxx
index eec00c88abd5..78f965e9d951 100644
--- a/include/test/table/xcellrange.hxx
+++ b/include/test/table/xcellrange.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_TEST_TABLE_XCELLRANGE_HXX
 
 #include <test/testdllapi.hxx>
-#include <rtl/ustring.h>
 
 #include <com/sun/star/uno/XInterface.hpp>
 
diff --git a/include/test/table/xtablecolumns.hxx b/include/test/table/xtablecolumns.hxx
index b4cc23faa465..204fb2860aa2 100644
--- a/include/test/table/xtablecolumns.hxx
+++ b/include/test/table/xtablecolumns.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_TEST_TABLE_XTABLECOLUMNS_HXX
 #define INCLUDED_TEST_TABLE_XTABLECOLUMNS_HXX
 
-#include <rtl/string.hxx>
-
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
 #include <com/sun/star/table/XCell.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/test/testinteractionhandler.hxx b/include/test/testinteractionhandler.hxx
index e4acac3abbab..49c3f04df2ff 100644
--- a/include/test/testinteractionhandler.hxx
+++ b/include/test/testinteractionhandler.hxx
@@ -14,7 +14,7 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionHandler2.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionPassword2.hpp>
diff --git a/include/test/text/baseindex.hxx b/include/test/text/baseindex.hxx
index 2c8d2734fa57..7a523ed55e28 100644
--- a/include/test/text/baseindex.hxx
+++ b/include/test/text/baseindex.hxx
@@ -12,6 +12,8 @@
 
 #include <test/testdllapi.hxx>
 
+#include <com/sun/star/uno/Reference.hxx>
+
 namespace apitest
 {
 class OOO_DLLPUBLIC_TEST BaseIndex
diff --git a/include/test/text/textdocumentindex.hxx b/include/test/text/textdocumentindex.hxx
index d045954018d2..92e827cfeba3 100644
--- a/include/test/text/textdocumentindex.hxx
+++ b/include/test/text/textdocumentindex.hxx
@@ -10,9 +10,8 @@
 #ifndef INCLUDED_TEST_TEXT_DOCUMENTINDEXTEST_HXX
 #define INCLUDED_TEST_TEXT_DOCUMENTINDEXTEST_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
-#include <test/unoapi_property_testers.hxx>
 #include <test/testdllapi.hxx>
 
 namespace apitest
diff --git a/include/test/text/textprintersettings.hxx b/include/test/text/textprintersettings.hxx
index a0508aa6b304..2ceac34b9b03 100644
--- a/include/test/text/textprintersettings.hxx
+++ b/include/test/text/textprintersettings.hxx
@@ -10,10 +10,9 @@
 #ifndef INCLUDED_TEST_TEXT_TEXTPRINTERSETTINGS_HXX
 #define INCLUDED_TEST_TEXT_TEXTPRINTERSETTINGS_HXX
 
-#include <test/unoapi_property_testers.hxx>
 #include <test/testdllapi.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace apitest
 {
diff --git a/include/test/text/textsettings.hxx b/include/test/text/textsettings.hxx
index 960692040ae7..9566f21dca5c 100644
--- a/include/test/text/textsettings.hxx
+++ b/include/test/text/textsettings.hxx
@@ -10,6 +10,10 @@
 #ifndef INCLUDED_TEST_TEXT_TEXTSETTINGS_HXX
 #define INCLUDED_TEST_TEXT_TEXTSETTINGS_HXX
 
+#include <test/testdllapi.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
+
 namespace apitest
 {
 class OOO_DLLPUBLIC_TEST TextSettings
diff --git a/include/test/text/xsimpletext.hxx b/include/test/text/xsimpletext.hxx
index fca6d24a0d6a..ec371ea2105b 100644
--- a/include/test/text/xsimpletext.hxx
+++ b/include/test/text/xsimpletext.hxx
@@ -12,7 +12,7 @@
 
 #include <test/testdllapi.hxx>
 
-#include <com/sun/star/text/XSimpleText.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace apitest
 {
diff --git a/include/test/text/xtext.hxx b/include/test/text/xtext.hxx
index ea1a1cb24170..d5c0801f7c31 100644
--- a/include/test/text/xtext.hxx
+++ b/include/test/text/xtext.hxx
@@ -12,7 +12,7 @@
 
 #include <test/testdllapi.hxx>
 
-#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
 
 namespace apitest {
 
diff --git a/include/test/util/xsearchable.hxx b/include/test/util/xsearchable.hxx
index cb612829e1e1..9fcbb5d27b88 100644
--- a/include/test/util/xsearchable.hxx
+++ b/include/test/util/xsearchable.hxx
@@ -12,6 +12,8 @@
 
 #include <test/testdllapi.hxx>
 
+#include <com/sun/star/uno/Reference.hxx>
+
 namespace apitest {
 
 class OOO_DLLPUBLIC_TEST XSearchable