summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2018-11-08 23:35:22 +0100
committerMiklos Vajna <vmiklos@collabora.com>2018-11-20 10:42:40 +0100
commita87a062fd4fac61fde6aa7f6b4277cc77438d119 (patch)
treec8475c940f0a83b60a6127fbe25d85e56ba4a41c /sc
parent228fed36aba7d6a9d02911bcf602218682442a56 (diff)
tdf#42949 Fix IWYU warnings in sc/qa/{perf,unit}/*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I031faa67192f21d20938c8cc8056db138326a1ca Reviewed-on: https://gerrit.libreoffice.org/63143 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/IwyuFilter_sc.yaml6
-rw-r--r--sc/qa/perf/scperfobj.cxx5
-rw-r--r--sc/qa/unit/bugfix-test.cxx1
-rw-r--r--sc/qa/unit/chart2dataprovider.cxx4
-rw-r--r--sc/qa/unit/cond_format_merge.cxx20
-rw-r--r--sc/qa/unit/copy_paste_test.cxx1
-rw-r--r--sc/qa/unit/datacache.cxx1
-rw-r--r--sc/qa/unit/dataproviders_test.cxx2
-rw-r--r--sc/qa/unit/datatransformation_test.cxx6
-rw-r--r--sc/qa/unit/filters-test.cxx12
-rw-r--r--sc/qa/unit/functions_test.hxx6
-rw-r--r--sc/qa/unit/helper/csv_handler.hxx7
-rw-r--r--sc/qa/unit/helper/debughelper.hxx6
-rw-r--r--sc/qa/unit/helper/qahelper.cxx8
-rw-r--r--sc/qa/unit/helper/qahelper.hxx10
-rw-r--r--sc/qa/unit/helper/xpath.hxx17
-rw-r--r--sc/qa/unit/mark_test.cxx6
-rw-r--r--sc/qa/unit/opencl-test.cxx22
-rw-r--r--sc/qa/unit/parallelism.cxx17
-rw-r--r--sc/qa/unit/pivottable_filters_test.cxx5
-rw-r--r--sc/qa/unit/range.cxx1
-rw-r--r--sc/qa/unit/rangelst_test.cxx2
-rw-r--r--sc/qa/unit/screenshots/screenshots.cxx19
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx14
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx14
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx6
-rw-r--r--sc/qa/unit/ucalc.cxx15
-rw-r--r--sc/qa/unit/ucalc.hxx3
-rw-r--r--sc/qa/unit/ucalc_condformat.cxx1
-rw-r--r--sc/qa/unit/ucalc_formula.cxx9
-rw-r--r--sc/qa/unit/ucalc_pivottable.cxx6
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx4
-rw-r--r--sc/qa/unit/ucalc_sort.cxx5
33 files changed, 73 insertions, 188 deletions
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index f7db11f4decc..fbc77d9daac6 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -369,6 +369,12 @@ blacklist:
sc/inc/unitconv.hxx:
# base class has to be a complete type
- map
+ sc/qa/unit/ucalc_formula.cxx:
+ # Needed in template
+ - docpool.hxx
+ sc/qa/unit/functions_test.hxx:
+ # Needed for css shortcut
+ - sal/types.h
sc/source/core/inc/addinlis.hxx:
# base class has to be a complete type
- com/sun/star/lang/XServiceInfo.hpp
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index 628fc1233669..4c63d3d1c6aa 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -27,16 +27,11 @@
#include <com/sun/star/sheet/XCalculatable.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/sheet/XCellRangeFormula.hpp>
-#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
-#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
#include <com/sun/star/sheet/XNamedRanges.hpp>
-#include <com/sun/star/sheet/XNamedRange.hpp>
#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/sheet/Border.hpp>
-#include <com/sun/star/sheet/NamedRangeFlag.hpp>
#include <com/sun/star/sheet/XSubTotalCalculatable.hpp>
#include <com/sun/star/sheet/SubTotalColumn.hpp>
#include <com/sun/star/sheet/GeneralFunction.hpp>
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 94fa2d188189..d7386343efdb 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -10,7 +10,6 @@
#include <validat.hxx>
#include <tabvwsh.hxx>
#include <com/sun/star/frame/Desktop.hpp>
-#include <vcl/scheduler.hxx>
#include "helper/qahelper.hxx"
using namespace ::com::sun::star;
diff --git a/sc/qa/unit/chart2dataprovider.cxx b/sc/qa/unit/chart2dataprovider.cxx
index f482283062f9..2e30b6090745 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -12,13 +12,9 @@
#include <docsh.hxx>
#include <chart2uno.hxx>
-#include <charthelper.hxx>
-#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/data/XDataSink.hpp>
#include "helper/qahelper.hxx"
diff --git a/sc/qa/unit/cond_format_merge.cxx b/sc/qa/unit/cond_format_merge.cxx
index 0ce3f21909bd..28da3a88fbb2 100644
--- a/sc/qa/unit/cond_format_merge.cxx
+++ b/sc/qa/unit/cond_format_merge.cxx
@@ -10,16 +10,24 @@
#include <sal/config.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/sheet/XConditionalFormats.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <test/bootstrapfixture.hxx>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <test/calc_unoapi_test.hxx>
-#include <global.hxx>
-#include <document.hxx>
-
-#include "helper/qahelper.hxx"
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace lang
+{
+class XComponent;
+}
+}
+}
+}
using namespace css;
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 742005df7e26..3b57bad7a6ec 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -8,7 +8,6 @@
*/
#include <sal/config.h>
-#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
#include <docsh.hxx>
diff --git a/sc/qa/unit/datacache.cxx b/sc/qa/unit/datacache.cxx
index d389bdf3d8b1..078e2421f110 100644
--- a/sc/qa/unit/datacache.cxx
+++ b/sc/qa/unit/datacache.cxx
@@ -8,7 +8,6 @@
*/
#include <sal/config.h>
-#include <test/bootstrapfixture.hxx>
#include <unotools/configmgr.hxx>
#include "helper/qahelper.hxx"
diff --git a/sc/qa/unit/dataproviders_test.cxx b/sc/qa/unit/dataproviders_test.cxx
index 2885a5a53a2e..1e9cf97e8dc3 100644
--- a/sc/qa/unit/dataproviders_test.cxx
+++ b/sc/qa/unit/dataproviders_test.cxx
@@ -10,9 +10,7 @@
#include "helper/qahelper.hxx"
#include <document.hxx>
-#include <stringutil.hxx>
#include <address.hxx>
-#include <dataprovider.hxx>
#include <dbdata.hxx>
#include <datamapper.hxx>
#include <scdll.hxx>
diff --git a/sc/qa/unit/datatransformation_test.cxx b/sc/qa/unit/datatransformation_test.cxx
index 4872f5684ec9..0cec07fb0742 100644
--- a/sc/qa/unit/datatransformation_test.cxx
+++ b/sc/qa/unit/datatransformation_test.cxx
@@ -11,15 +11,9 @@
#include "helper/qahelper.hxx"
#include <document.hxx>
-#include <stringutil.hxx>
-#include <address.hxx>
-#include <dataprovider.hxx>
#include <datatransformation.hxx>
#include <scdll.hxx>
-#include <vcl/scheduler.hxx>
-#include <tools/datetime.hxx>
#include <tools/time.hxx>
-#include <memory>
class ScDataTransformationTest : public ScBootstrapFixture
{
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 021eeb9e9952..24be3958dc2c 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -10,25 +10,13 @@
#include <sal/config.h>
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-
-#include <scdll.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/stritem.hxx>
#include "helper/qahelper.hxx"
#include <docsh.hxx>
#include <inputopt.hxx>
#include <postit.hxx>
-#include <patattr.hxx>
-#include <scitems.hxx>
#include <document.hxx>
-#include <cellform.hxx>
#include <drwlayer.hxx>
#include <userdat.hxx>
#include <formulacell.hxx>
diff --git a/sc/qa/unit/functions_test.hxx b/sc/qa/unit/functions_test.hxx
index 407efbf7b124..0964214fbb4f 100644
--- a/sc/qa/unit/functions_test.hxx
+++ b/sc/qa/unit/functions_test.hxx
@@ -8,11 +8,13 @@
*/
#include <sal/config.h>
+#include <sal/types.h>
#include <unotest/filters-test.hxx>
-#include <scdll.hxx>
#include "helper/qahelper.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+
class SCQAHELPER_DLLPUBLIC FunctionsTest : public ScBootstrapFixture, public test::FiltersTest
{
public:
@@ -30,7 +32,7 @@ public:
unsigned int nFilterVersion) override;
private:
- uno::Reference<uno::XInterface> m_xCalcComponent;
+ css::uno::Reference<css::uno::XInterface> m_xCalcComponent;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 1f7c3ac2e3b8..f9d0f31b18d5 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -10,20 +10,15 @@
#ifndef INCLUDED_SC_QA_UNIT_HELPER_CSV_HANDLER_HXX
#define INCLUDED_SC_QA_UNIT_HELPER_CSV_HANDLER_HXX
-#include <iostream>
+#include "qahelper.hxx"
-#include <docsh.hxx>
-#include <postit.hxx>
#include <patattr.hxx>
-#include <scitems.hxx>
#include <document.hxx>
#include <cellform.hxx>
#include <cellvalue.hxx>
#include <rtl/strbuf.hxx>
-#include <test/bootstrapfixture.hxx>
-
#define DEBUG_CSV_HANDLER 0
inline OUString getConditionalFormatString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
diff --git a/sc/qa/unit/helper/debughelper.hxx b/sc/qa/unit/helper/debughelper.hxx
index 4f8dd6633590..fedde10dd120 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -10,10 +10,6 @@
#ifndef INCLUDED_SC_QA_UNIT_HELPER_DEBUGHELPER_HXX
#define INCLUDED_SC_QA_UNIT_HELPER_DEBUGHELPER_HXX
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.hxx>
-
#ifdef _WIN32
#if !defined NOMINMAX
#define NOMINMAX
@@ -27,8 +23,6 @@
#include <iostream>
#include <vector>
-#include <svl/gridprinter.hxx>
-
#define CALC_DEBUG_OUTPUT 0
#define CALC_TEST_PERF 0
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 182cc995dd68..bc523cffe920 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -9,6 +9,7 @@
#include "qahelper.hxx"
#include "csv_handler.hxx"
+#include "debughelper.hxx"
#include <drwlayer.hxx>
#include <compiler.hxx>
#include <conditio.hxx>
@@ -24,13 +25,16 @@
#include <cppunit/AdditionalMessage.h>
#include <sal/log.hxx>
#include <sfx2/sfxsids.hrc>
+#include <svl/gridprinter.hxx>
+#include <sfx2/docfilt.hxx>
+#include <sfx2/docfile.hxx>
+#include <unotools/tempfile.hxx>
+#include <scitems.hxx>
#include <orcus/csv_parser.hpp>
#include <fstream>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/text/textfield/Type.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 37bbdc35ff50..2482248a1754 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -10,8 +10,6 @@
#ifndef INCLUDED_SC_QA_UNIT_HELPER_QAHELPER_HXX
#define INCLUDED_SC_QA_UNIT_HELPER_QAHELPER_HXX
-#include <scdllapi.h>
-#include "debughelper.hxx"
#include <docsh.hxx>
#include <address.hxx>
@@ -20,13 +18,7 @@
#include <test/bootstrapfixture.hxx>
#include <comphelper/documentconstants.hxx>
-#include <osl/detail/android-bootstrap.h>
-
-#include <unotools/tempfile.hxx>
#include <comphelper/fileformat.h>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <svl/stritem.hxx>
#include <formula/grammar.hxx>
#include <string>
@@ -36,6 +28,8 @@
#include <memory>
+namespace utl { class TempFile; }
+
#if defined(SCQAHELPER_DLLIMPLEMENTATION)
#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index f8ca5684c541..39813bea85cd 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -10,26 +10,25 @@
#ifndef INCLUDED_SC_QA_UNIT_HELPER_XPATH_HXX
#define INCLUDED_SC_QA_UNIT_HELPER_XPATH_HXX
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <libxml/parser.h>
-#include <unotools/tempfile.hxx>
-
-#include <libxml/xpathInternals.h>
-#include <libxml/parserInternals.h>
-
-#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
+#include <sal/types.h>
#include <memory>
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace utl { class TempFile; }
+class ScDocShell;
+class SvStream;
+
#if defined(SCQAHELPER_DLLIMPLEMENTATION)
#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#include <docsh.hxx>
-
using namespace com::sun::star;
class ScBootstrapFixture;
diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx
index 6e00e4bf163d..16122da55f8c 100644
--- a/sc/qa/unit/mark_test.cxx
+++ b/sc/qa/unit/mark_test.cxx
@@ -8,8 +8,10 @@
*/
#include <sal/config.h>
-#include <test/bootstrapfixture.hxx>
-#include "helper/qahelper.hxx"
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
+#include <cppunit/plugin/TestPlugIn.h>
#include <markdata.hxx>
#include "../../source/core/data/markarr.cxx"
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index 059027623989..79cf3ab8fb69 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -2,35 +2,13 @@
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-
-#include <scdll.hxx>
-#include <opencl/platforminfo.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/stritem.hxx>
#include "helper/qahelper.hxx"
-#include <calcconfig.hxx>
-#include <interpre.hxx>
-
#include <docsh.hxx>
-#include <postit.hxx>
-#include <patattr.hxx>
-#include <scitems.hxx>
#include <document.hxx>
-#include <cellform.hxx>
-#include <drwlayer.hxx>
-#include <userdat.hxx>
-#include <formulacell.hxx>
#include <formulagroup.hxx>
-#include <svx/svdpage.hxx>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 8c41318a5b1c..f8f5db920c45 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -2,35 +2,18 @@
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
#include <scdll.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/stritem.hxx>
#include "helper/qahelper.hxx"
-#include <calcconfig.hxx>
-#include <interpre.hxx>
-
#include <docsh.hxx>
-#include <postit.hxx>
-#include <patattr.hxx>
-#include <scitems.hxx>
#include <document.hxx>
-#include <cellform.hxx>
-#include <drwlayer.hxx>
-#include <userdat.hxx>
#include <formulacell.hxx>
#include <formulagroup.hxx>
#include <scopetools.hxx>
-#include <svx/svdpage.hxx>
-
#include <officecfg/Office/Calc.hxx>
using namespace css;
diff --git a/sc/qa/unit/pivottable_filters_test.cxx b/sc/qa/unit/pivottable_filters_test.cxx
index ceb43d6ce664..b7830b2e7d31 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -8,15 +8,12 @@
*/
#include <sal/config.h>
-#include <osl/file.hxx>
-#include <config_features.h>
#include "helper/qahelper.hxx"
+#include "helper/debughelper.hxx"
#include "helper/xpath.hxx"
-#include "helper/shared_test_impl.hxx"
#include <patattr.hxx>
-#include <docpool.hxx>
#include <scitems.hxx>
#include <document.hxx>
#include <generalfunction.hxx>
diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx
index 67f4ecb92194..4eb490d81b56 100644
--- a/sc/qa/unit/range.cxx
+++ b/sc/qa/unit/range.cxx
@@ -10,7 +10,6 @@
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
#include <unotools/configmgr.hxx>
-#include "helper/qahelper.hxx"
#include <document.hxx>
#include <docsh.hxx>
#include <global.hxx>
diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index f955fc9167ef..e0f8bbefbf33 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -9,8 +9,6 @@
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
-#include "helper/qahelper.hxx"
-#include <document.hxx>
#include <docsh.hxx>
#include <scdll.hxx>
diff --git a/sc/qa/unit/screenshots/screenshots.cxx b/sc/qa/unit/screenshots/screenshots.cxx
index 5b137437c0f2..8f212bbda1e8 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -10,35 +10,16 @@
#include <memory>
#include <test/screenshot_test.hxx>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <editeng/editids.hrc>
-#include <editeng/editview.hxx>
-#include <editeng/outliner.hxx>
-#include <osl/endian.h>
-#include <osl/conditn.hxx>
-#include <osl/file.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/sfxdlg.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/lokhelper.hxx>
-#include <svl/srchitem.hxx>
#include <svx/numinf.hxx>
-#include <vcl/pngwrite.hxx>
-#include <vcl/weld.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
#include <document.hxx>
-#include <sharedocdlg.hxx>
-#include <protectiondlg.hxx>
-#include <docuno.hxx>
#include <scabstdlg.hxx>
-#include <reffact.hxx>
#include <scui_def.hxx>
-#include <impex.hxx>
#include <patattr.hxx>
-#include <sc.hrc>
#include <strings.hrc>
#include <scresid.hxx>
#include <scitems.hxx>
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 2472b3f9d55f..1425ff330954 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -9,17 +9,15 @@
#include <officecfg/Office/Common.hxx>
#include <sal/config.h>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
#include <config_features.h>
-#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/stritem.hxx>
#include <sfx2/sfxsids.hrc>
+#include <sfx2/docfilt.hxx>
+#include "helper/debughelper.hxx"
#include "helper/qahelper.hxx"
#include "helper/xpath.hxx"
#include "helper/shared_test_impl.hxx"
@@ -30,23 +28,18 @@
#include <docpool.hxx>
#include <scitems.hxx>
#include <document.hxx>
-#include <cellform.hxx>
#include <formulacell.hxx>
#include <tokenarray.hxx>
#include <editutil.hxx>
#include <scopetools.hxx>
#include <cellvalue.hxx>
-#include <docfunc.hxx>
-#include <generalfunction.hxx>
#include <postit.hxx>
#include <tokenstringcontext.hxx>
#include <chgtrack.hxx>
#include <validat.hxx>
-#include <attrib.hxx>
#include <global.hxx>
#include <scmod.hxx>
-#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdograf.hxx>
#include <tabprotection.hxx>
@@ -69,11 +62,8 @@
#include <svl/zformat.hxx>
#include <test/xmltesttools.hxx>
-#include <com/sun/star/table/BorderLineStyle.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/GraphicType.hpp>
#include <comphelper/storagehelper.hxx>
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index eca265feeb9d..67471ea15af0 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -15,14 +15,12 @@
#include <osl/file.hxx>
#include <config_features.h>
-#include <sfx2/app.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
#include <svl/stritem.hxx>
-#include <svl/nfkeytab.hxx>
#include <svl/zformat.hxx>
#include <svx/svdograf.hxx>
+#include <svx/svxids.hrc>
#include <drwlayer.hxx>
#include <svx/svdpage.hxx>
@@ -57,7 +55,6 @@
#include <editutil.hxx>
#include <cellvalue.hxx>
#include <attrib.hxx>
-#include <tabvwsh.hxx>
#include <fillinfo.hxx>
#include <scopetools.hxx>
#include <columnspanset.hxx>
@@ -67,24 +64,19 @@
#include <stlpool.hxx>
#include <hints.hxx>
-#include <orcusfiltersimpl.hxx>
#include <orcusfilters.hxx>
#include <filter.hxx>
-#include <orcusinterface.hxx>
-#include <generalfunction.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/text/textfield/Type.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include "helper/qahelper.hxx"
#include "helper/shared_test_impl.hxx"
-#include <algorithm>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2bbb71a1ec8a..0df9df47c65a 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -19,15 +19,9 @@
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertysequence.hxx>
-#include <comphelper/string.hxx>
-#include <editeng/editids.hrc>
-#include <editeng/editview.hxx>
-#include <editeng/outliner.hxx>
#include <osl/conditn.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
-#include <svl/srchitem.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/propertyvalue.hxx>
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index f0c418fb856f..6853c66ac0ae 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -8,14 +8,14 @@
*/
#include "ucalc.hxx"
+#include "helper/debughelper.hxx"
+#include "helper/qahelper.hxx"
#include <sal/config.h>
#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <osl/time.h>
#include <svl/asiancfg.hxx>
+#include <svl/gridprinter.hxx>
#include <scdll.hxx>
#include <formulacell.hxx>
@@ -37,18 +37,15 @@
#include <reftokenhelper.hxx>
#include <userdat.hxx>
#include <clipcontext.hxx>
+#include <refdata.hxx>
#include <docsh.hxx>
#include <docfunc.hxx>
-#include <dbdocfun.hxx>
#include <funcdesc.hxx>
-#include <externalrefmgr.hxx>
#include <calcconfig.hxx>
-#include <interpre.hxx>
#include <columniterator.hxx>
#include <types.hxx>
-#include <fillinfo.hxx>
#include <tokenarray.hxx>
#include <scopetools.hxx>
#include <dociter.hxx>
@@ -73,14 +70,12 @@
#include <formula/IFunctionDescription.hxx>
-#include <o3tl/make_unique.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
-#include <svx/svdograf.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
@@ -94,8 +89,6 @@
#include <iostream>
#include <memory>
-#include <sstream>
-#include <utility>
#include <vector>
struct TestImpl
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 9f69783ad815..35378b152711 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -10,7 +10,8 @@
#ifndef INCLUDED_SC_QA_UNIT_UCALC_HXX
#define INCLUDED_SC_QA_UNIT_UCALC_HXX
-#include "helper/qahelper.hxx"
+#include <test/bootstrapfixture.hxx>
+#include <docsh.hxx>
#include <document.hxx>
#include <stringutil.hxx>
#include <memory>
diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx
index 633bfd86fbcc..bb469678ab52 100644
--- a/sc/qa/unit/ucalc_condformat.cxx
+++ b/sc/qa/unit/ucalc_condformat.cxx
@@ -9,6 +9,7 @@
#include <memory>
#include "ucalc.hxx"
+#include "helper/qahelper.hxx"
#include <conditio.hxx>
#include <colorscale.hxx>
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 3c1b462933c4..fc505c281c18 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -8,17 +8,16 @@
*/
#include "ucalc.hxx"
+#include "helper/debughelper.hxx"
+#include "helper/qahelper.hxx"
#include <markdata.hxx>
#include <calcconfig.hxx>
#include <clipparam.hxx>
-#include <interpre.hxx>
#include <compiler.hxx>
#include <tokenarray.hxx>
#include <refdata.hxx>
#include <scopetools.hxx>
#include <formulacell.hxx>
-#include <formulagroup.hxx>
-#include <scmod.hxx>
#include <docsh.hxx>
#include <docfunc.hxx>
#include <paramisc.hxx>
@@ -32,12 +31,14 @@
#include <docpool.hxx>
#include <docoptio.hxx>
#include <formulaopt.hxx>
+#include <externalrefmgr.hxx>
+#include <svl/itemset.hxx>
#include <formula/vectortoken.hxx>
#include <o3tl/make_unique.hxx>
-#include <officecfg/Office/Common.hxx>
#include <svl/broadcast.hxx>
#include <svl/intitem.hxx>
+#include <sfx2/docfile.hxx>
#include <memory>
#include <functional>
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index d62a6cb3b9d0..f455152da133 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -8,7 +8,9 @@
*/
#include <memory>
+#include <sal/types.h>
#include "ucalc.hxx"
+#include "helper/qahelper.hxx"
#include <dpshttab.hxx>
#include <dpobject.hxx>
#include <dpsave.hxx>
@@ -27,8 +29,8 @@
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <com/sun/star/sheet/DataPilotFieldReferenceType.hpp>
#include <com/sun/star/sheet/DataPilotFieldReferenceItemType.hpp>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
-#include <com/sun/star/sheet/GeneralFunction2.hpp>
+
+using namespace ::com::sun::star;
namespace {
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 853f54c30ff9..b54216b413d4 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -9,11 +9,12 @@
#include <memory>
#include "ucalc.hxx"
+#include "helper/debughelper.hxx"
+#include "helper/qahelper.hxx"
#include <editutil.hxx>
#include <formulacell.hxx>
#include <cellvalue.hxx>
#include <docsh.hxx>
-#include <clipparam.hxx>
#include <undoblk.hxx>
#include <scopetools.hxx>
#include <docfunc.hxx>
@@ -26,6 +27,7 @@
#include <sharedformula.hxx>
#include <svl/sharedstring.hxx>
+#include <sfx2/docfile.hxx>
#include <formula/grammar.hxx>
diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index bf817873a341..00473f4d7757 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -9,6 +9,8 @@
#include "ucalc.hxx"
#include "helper/sorthelper.hxx"
+#include "helper/debughelper.hxx"
+#include "helper/qahelper.hxx"
#include <postit.hxx>
#include <sortparam.hxx>
@@ -21,16 +23,15 @@
#include <docfunc.hxx>
#include <scitems.hxx>
#include <editutil.hxx>
-#include <table.hxx>
#include <drwlayer.hxx>
#include <formulaopt.hxx>
#include <sal/config.h>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
+#include <editeng/editobj.hxx>
#include <svx/svdocirc.hxx>
#include <svx/svdpage.hxx>
-#include <test/bootstrapfixture.hxx>
void Test::testSort()
{