[Libreoffice-commits] core.git: test/IwyuFilter_test.yaml test/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 19 09:20:50 UTC 2019
test/IwyuFilter_test.yaml | 79 ++++++++++++++++++
test/source/beans/xpropertyset.cxx | 5 -
test/source/bootstrapfixture.cxx | 11 --
test/source/chart/xchartdata.cxx | 2
test/source/container/xchild.cxx | 4
test/source/container/xelementaccess.cxx | 2
test/source/container/xenumeration.cxx | 2
test/source/container/xenumerationaccess.cxx | 2
test/source/container/xindexaccess.cxx | 2
test/source/container/xnameaccess.cxx | 3
test/source/container/xnamecontainer.cxx | 5 -
test/source/container/xnamed.cxx | 2
test/source/container/xnamereplace.cxx | 2
test/source/diff/diff.cxx | 7 -
test/source/document/xactionlockable.cxx | 2
test/source/document/xembeddedobjectsupplier.cxx | 2
test/source/document/xlinktargetsupplier.cxx | 2
test/source/drawing/captionshape.cxx | 2
test/source/drawing/xdrawpages.cxx | 3
test/source/drawing/xgluepointssupplier.cxx | 2
test/source/drawing/xshape.cxx | 2
test/source/drawing/xshapedescriptor.cxx | 2
test/source/drawing/xshapegrouper.cxx | 3
test/source/drawing/xshapes.cxx | 2
test/source/helper/form.cxx | 1
test/source/helper/shape.cxx | 1
test/source/lang/xcomponent.cxx | 3
test/source/lang/xserviceinfo.cxx | 3
test/source/screenshot_test.cxx | 2
test/source/setupvcl.cxx | 2
test/source/sheet/cellarealink.cxx | 4
test/source/sheet/cellproperties.cxx | 3
test/source/sheet/databaseimportdescriptor.cxx | 2
test/source/sheet/databaserange.cxx | 2
test/source/sheet/datapilotfield.cxx | 7 -
test/source/sheet/datapilotitem.cxx | 3
test/source/sheet/documentsettings.cxx | 2
test/source/sheet/functiondescription.cxx | 3
test/source/sheet/globalsheetsettings.cxx | 2
test/source/sheet/scenario.cxx | 3
test/source/sheet/shape.cxx | 2
test/source/sheet/sheetcell.cxx | 3
test/source/sheet/sheetcellrange.cxx | 2
test/source/sheet/sheetcellranges.cxx | 3
test/source/sheet/sheetfilterdescriptor.cxx | 2
test/source/sheet/sheetlink.cxx | 2
test/source/sheet/sheetsortdescriptor2.cxx | 6 -
test/source/sheet/spreadsheet.cxx | 2
test/source/sheet/spreadsheetdocumentsettings.cxx | 2
test/source/sheet/spreadsheetviewsettings.cxx | 2
test/source/sheet/subtotaldescriptor.cxx | 2
test/source/sheet/tableautoformat.cxx | 2
test/source/sheet/tablevalidation.cxx | 2
test/source/sheet/xactivationbroadcaster.cxx | 2
test/source/sheet/xarealink.cxx | 2
test/source/sheet/xarealinks.cxx | 2
test/source/sheet/xarrayformularange.cxx | 2
test/source/sheet/xcalculatable.cxx | 2
test/source/sheet/xcelladdressable.cxx | 2
test/source/sheet/xcellformatrangessupplier.cxx | 2
test/source/sheet/xcellrangeaddressable.cxx | 2
test/source/sheet/xcellrangedata.cxx | 2
test/source/sheet/xcellrangeformula.cxx | 2
test/source/sheet/xcellrangemovement.cxx | 5 -
test/source/sheet/xcellrangereferrer.cxx | 2
test/source/sheet/xcellrangesquery.cxx | 2
test/source/sheet/xcellseries.cxx | 2
test/source/sheet/xconsolidatable.cxx | 3
test/source/sheet/xconsolidationdescriptor.cxx | 2
test/source/sheet/xdatabaserange.cxx | 6 -
test/source/sheet/xdatabaseranges.cxx | 4
test/source/sheet/xdatapilotdescriptor.cxx | 2
test/source/sheet/xdatapilotfield.cxx | 2
test/source/sheet/xdatapilotfieldgrouping.cxx | 2
test/source/sheet/xdatapilottable.cxx | 9 --
test/source/sheet/xdatapilottable2.cxx | 3
test/source/sheet/xdatapilottables.cxx | 2
test/source/sheet/xdatapilottablessupplier.cxx | 2
test/source/sheet/xddelink.cxx | 2
test/source/sheet/xddelinks.cxx | 2
test/source/sheet/xdocumentauditing.cxx | 3
test/source/sheet/xformulaquery.cxx | 2
test/source/sheet/xfunctiondescriptions.cxx | 3
test/source/sheet/xgoalseek.cxx | 2
test/source/sheet/xheaderfootercontent.cxx | 3
test/source/sheet/xlabelrange.cxx | 2
test/source/sheet/xlabelranges.cxx | 2
test/source/sheet/xmultiformulatokens.cxx | 2
test/source/sheet/xmultipleoperation.cxx | 3
test/source/sheet/xnamedrange.cxx | 14 ---
test/source/sheet/xnamedranges.cxx | 6 -
test/source/sheet/xprintareas.cxx | 3
test/source/sheet/xrecentfunctions.cxx | 2
test/source/sheet/xscenario.cxx | 2
test/source/sheet/xscenarioenhanced.cxx | 3
test/source/sheet/xscenarios.cxx | 2
test/source/sheet/xscenariossupplier.cxx | 2
test/source/sheet/xsheetannotation.cxx | 2
test/source/sheet/xsheetannotationanchor.cxx | 2
test/source/sheet/xsheetannotations.cxx | 2
test/source/sheet/xsheetannotationshapesupplier.cxx | 2
test/source/sheet/xsheetannotationssupplier.cxx | 2
test/source/sheet/xsheetauditing.cxx | 2
test/source/sheet/xsheetcellcursor.cxx | 2
test/source/sheet/xsheetcellrange.cxx | 2
test/source/sheet/xsheetcellrangecontainer.cxx | 2
test/source/sheet/xsheetcellranges.cxx | 3
test/source/sheet/xsheetcondition.cxx | 3
test/source/sheet/xsheetconditionalentries.cxx | 5 -
test/source/sheet/xsheetconditionalentry.cxx | 2
test/source/sheet/xsheetfilterable.cxx | 2
test/source/sheet/xsheetfilterableex.cxx | 4
test/source/sheet/xsheetfilterdescriptor.cxx | 2
test/source/sheet/xsheetfilterdescriptor2.cxx | 2
test/source/sheet/xsheetfilterdescriptor3.cxx | 2
test/source/sheet/xsheetlinkable.cxx | 2
test/source/sheet/xsheetoperation.cxx | 2
test/source/sheet/xsheetoutline.cxx | 2
test/source/sheet/xsheetpagebreak.cxx | 3
test/source/sheet/xspreadsheet.cxx | 2
test/source/sheet/xspreadsheetdocument.cxx | 2
test/source/sheet/xspreadsheets.cxx | 2
test/source/sheet/xspreadsheets2.cxx | 10 --
test/source/sheet/xspreadsheetview.cxx | 2
test/source/sheet/xsubtotalcalculatable.cxx | 2
test/source/sheet/xsubtotaldescriptor.cxx | 2
test/source/sheet/xsubtotalfield.cxx | 2
test/source/sheet/xuniquecellformatrangessupplier.cxx | 2
test/source/sheet/xusedareacursor.cxx | 2
test/source/sheet/xviewfreezable.cxx | 2
test/source/sheet/xviewsplitable.cxx | 2
test/source/style/xstyleloader.cxx | 2
test/source/table/tablecolumn.cxx | 2
test/source/table/tablerow.cxx | 3
test/source/table/xcell.cxx | 3
test/source/table/xcellcursor.cxx | 4
test/source/table/xcellrange.cxx | 2
test/source/table/xcolumnrowrange.cxx | 3
test/source/table/xtablechart.cxx | 2
test/source/table/xtablecharts.cxx | 2
test/source/table/xtablechartssupplier.cxx | 2
test/source/table/xtablecolumns.cxx | 3
test/source/table/xtablerows.cxx | 2
test/source/text/baseindex.cxx | 4
test/source/text/textcontent.cxx | 2
test/source/text/textsettings.cxx | 2
test/source/text/xdocumentindex.cxx | 3
test/source/text/xsimpletext.cxx | 2
test/source/text/xtextcontent.cxx | 2
test/source/text/xtextfield.cxx | 3
test/source/text/xtextrange.cxx | 3
test/source/unoapi_property_testers.cxx | 2
test/source/util/searchdescriptor.cxx | 2
test/source/util/xindent.cxx | 3
test/source/util/xmergeable.cxx | 3
test/source/util/xrefreshable.cxx | 2
test/source/util/xreplaceable.cxx | 2
test/source/util/xreplacedescriptor.cxx | 2
test/source/util/xsearchable.cxx | 2
test/source/util/xsearchdescriptor.cxx | 2
test/source/vclbootstrapprotector.cxx | 3
test/source/view/xcontrolaccess.cxx | 3
test/source/view/xformlayeraccess.cxx | 3
163 files changed, 233 insertions(+), 284 deletions(-)
New commits:
commit 7ac769c1a915ea33d997f452f3b86eb11fa00c8a
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Dec 15 14:26:30 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Dec 19 10:20:04 2019 +0100
tdf#42949 Fix IWYU warnings in test/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Id1ee9b6d44315443d023bdfbf9ae8e5aa2158ab2
Reviewed-on: https://gerrit.libreoffice.org/85171
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/test/IwyuFilter_test.yaml b/test/IwyuFilter_test.yaml
new file mode 100644
index 000000000000..2c6bb3b883b9
--- /dev/null
+++ b/test/IwyuFilter_test.yaml
@@ -0,0 +1,79 @@
+---
+assumeFilename: test/source/unoapi_test.cxx
+blacklist:
+ test/source/vclbootstrapprotector.cxx:
+ # Used in Coverity-specific #ifdef
+ - sal/log.hxx
+ test/source/container/xchild.cxx:
+ # Actually used
+ - com/sun/star/uno/XInterface.hpp
+ test/source/container/xnamereplace.cxx:
+ # Actually used
+ - com/sun/star/uno/Any.hxx
+ test/source/drawing/xshape.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/drawing/captionshape.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/helper/shape.cxx:
+ # Actually used
+ - com/sun/star/lang/XComponent.hpp
+ test/source/sheet/databaserange.cxx:
+ # Actually used
+ - com/sun/star/sheet/XDatabaseRange.hpp
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/sheetcell.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/sheetcellrange.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/sheetfilterdescriptor.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xarealink.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xcalculatable.cxx:
+ # Actually used
+ - com/sun/star/table/XCell.hpp
+ test/source/sheet/xcelladdressable.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xcellrangereferrer.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xconsolidationdescriptor.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xdocumentauditing.cxx:
+ # Actually used
+ - com/sun/star/awt/Point.hpp
+ - com/sun/star/beans/PropertyValue.hpp
+ - com/sun/star/frame/XFrame.hpp
+ test/source/sheet/xformulaquery.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xlabelrange.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xnamedrange.cxx:
+ # Actually used
+ - com/sun/star/sheet/XNamedRange.hpp
+ test/source/sheet/xscenarioenhanced.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xsheetannotationanchor.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/sheet/xsheetcellrangecontainer.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/table/xtablechart.cxx:
+ # Needed for template
+ - test/cppunitasserthelper.hxx
+ test/source/text/textcontent.cxx:
+ # Actually used
+ - com/sun/star/text/TextContentAnchorType.hpp
diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index ac9be2a6f81e..d42bc836ca88 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -14,7 +14,6 @@
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/XVetoableChangeListener.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/util/DateTime.hpp>
@@ -26,9 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-#include <set>
-
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 545dfe5516f6..e0f08b036cd5 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -12,30 +12,21 @@
#include <test/bootstrapfixture.hxx>
#include <test/setupvcl.hxx>
#include <vcl/errinf.hxx>
-#include <rtl/strbuf.hxx>
-#include <rtl/bootstrap.hxx>
#include <sal/log.hxx>
-#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XUniversalContentBroker.hpp>
-#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
-#include <unotools/resmgr.hxx>
#include <tools/link.hxx>
#include <vcl/graphicfilter.hxx>
-#include <unotools/syslocaleoptions.hxx>
#include <osl/file.hxx>
+#include <osl/process.h>
#include <unotools/tempfile.hxx>
#include <vcl/scheduler.hxx>
-#include "isheadless.hxx"
-
#include <memory>
#include <cstring>
diff --git a/test/source/chart/xchartdata.cxx b/test/source/chart/xchartdata.cxx
index e7669fbd149a..dcecf33a0c3d 100644
--- a/test/source/chart/xchartdata.cxx
+++ b/test/source/chart/xchartdata.cxx
@@ -17,7 +17,7 @@
#include <com/sun/star/chart/XChartDataChangeEventListener.hpp>
#include <com/sun/star/lang/EventObject.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/container/xchild.cxx b/test/source/container/xchild.cxx
index 45627ed03de0..eac97b0ebe05 100644
--- a/test/source/container/xchild.cxx
+++ b/test/source/container/xchild.cxx
@@ -7,16 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/container/xchild.hxx>
#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/container/xelementaccess.cxx b/test/source/container/xelementaccess.cxx
index d751fef4ff1b..4ec7515209cc 100644
--- a/test/source/container/xelementaccess.cxx
+++ b/test/source/container/xelementaccess.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/container/XElementAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/container/xenumeration.cxx b/test/source/container/xenumeration.cxx
index e102a6deb1dd..190ef27fe757 100644
--- a/test/source/container/xenumeration.cxx
+++ b/test/source/container/xenumeration.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/container/xenumerationaccess.cxx b/test/source/container/xenumerationaccess.cxx
index 316a25e361d9..e3c53064ed70 100644
--- a/test/source/container/xenumerationaccess.cxx
+++ b/test/source/container/xenumerationaccess.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/container/xindexaccess.cxx b/test/source/container/xindexaccess.cxx
index 9139136b36b3..7fc08027c4ad 100644
--- a/test/source/container/xindexaccess.cxx
+++ b/test/source/container/xindexaccess.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/container/xnameaccess.cxx b/test/source/container/xnameaccess.cxx
index 13199b9764b1..3616c4cda363 100644
--- a/test/source/container/xnameaccess.cxx
+++ b/test/source/container/xnameaccess.cxx
@@ -8,7 +8,6 @@
*/
#include <test/container/xnameaccess.hxx>
-#include <rtl/string.hxx>
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -16,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/container/xnamecontainer.cxx b/test/source/container/xnamecontainer.cxx
index e5e8d8dead8e..5df1e76b3e3c 100644
--- a/test/source/container/xnamecontainer.cxx
+++ b/test/source/container/xnamecontainer.cxx
@@ -13,14 +13,11 @@
#include <com/sun/star/container/NoSuchElementException.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <iostream>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index e2968dca9d8e..799011f41ebd 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/container/xnamereplace.cxx b/test/source/container/xnamereplace.cxx
index b1fdc9ec8cf0..2475cb5a00dd 100644
--- a/test/source/container/xnamereplace.cxx
+++ b/test/source/container/xnamereplace.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 050c5e457f59..65780a4a897c 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -13,17 +13,14 @@
#include <libxml/xpath.h>
#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlmemory.h>
#include <set>
-#include <cstring>
#include <sstream>
-#include <cmath>
#include <cassert>
+#include <vector>
#if USE_CPPUNIT
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#endif
#include <rtl/math.hxx>
diff --git a/test/source/document/xactionlockable.cxx b/test/source/document/xactionlockable.cxx
index 7a2380f49608..47d2774ae626 100644
--- a/test/source/document/xactionlockable.cxx
+++ b/test/source/document/xactionlockable.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/document/xembeddedobjectsupplier.cxx b/test/source/document/xembeddedobjectsupplier.cxx
index 8a0ce9b32d55..baa2ecbfbeb8 100644
--- a/test/source/document/xembeddedobjectsupplier.cxx
+++ b/test/source/document/xembeddedobjectsupplier.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/document/xlinktargetsupplier.cxx b/test/source/document/xlinktargetsupplier.cxx
index 67ff19f723a2..eec08a90047c 100644
--- a/test/source/document/xlinktargetsupplier.cxx
+++ b/test/source/document/xlinktargetsupplier.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/drawing/captionshape.cxx b/test/source/drawing/captionshape.cxx
index 807b2ee08379..66093e70dd45 100644
--- a/test/source/drawing/captionshape.cxx
+++ b/test/source/drawing/captionshape.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/awt/Point.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/drawing/xdrawpages.cxx b/test/source/drawing/xdrawpages.cxx
index 29aec3fd3d32..be57c48522c7 100644
--- a/test/source/drawing/xdrawpages.cxx
+++ b/test/source/drawing/xdrawpages.cxx
@@ -11,13 +11,12 @@
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPages.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <sal/types.h>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/drawing/xgluepointssupplier.cxx b/test/source/drawing/xgluepointssupplier.cxx
index 68d6b6fb6269..186c18d71a7e 100644
--- a/test/source/drawing/xgluepointssupplier.cxx
+++ b/test/source/drawing/xgluepointssupplier.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/drawing/xshape.cxx b/test/source/drawing/xshape.cxx
index 6992663f56d0..a63b89265798 100644
--- a/test/source/drawing/xshape.cxx
+++ b/test/source/drawing/xshape.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/drawing/xshapedescriptor.cxx b/test/source/drawing/xshapedescriptor.cxx
index 37c95e75eff0..ff14513ef8fd 100644
--- a/test/source/drawing/xshapedescriptor.cxx
+++ b/test/source/drawing/xshapedescriptor.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/drawing/xshapegrouper.cxx b/test/source/drawing/xshapegrouper.cxx
index 6595050ad418..353faa1e7872 100644
--- a/test/source/drawing/xshapegrouper.cxx
+++ b/test/source/drawing/xshapegrouper.cxx
@@ -14,11 +14,10 @@
#include <com/sun/star/drawing/XShapeGroup.hpp>
#include <com/sun/star/drawing/XShapeGrouper.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/drawing/xshapes.cxx b/test/source/drawing/xshapes.cxx
index 4fce5cc748ec..d836daf2b732 100644
--- a/test/source/drawing/xshapes.cxx
+++ b/test/source/drawing/xshapes.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx
index 3b78afa3871e..89e9fb1a9536 100644
--- a/test/source/helper/form.cxx
+++ b/test/source/helper/form.cxx
@@ -8,7 +8,6 @@
*/
#include <test/helper/form.hxx>
-#include <rtl/string.hxx>
#include <sal/types.h>
#include <com/sun/star/awt/Point.hpp>
diff --git a/test/source/helper/shape.cxx b/test/source/helper/shape.cxx
index 130951527706..abb86e39e1a9 100644
--- a/test/source/helper/shape.cxx
+++ b/test/source/helper/shape.cxx
@@ -9,7 +9,6 @@
#include <test/helper/shape.hxx>
#include <sal/types.h>
-#include <rtl/string.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/test/source/lang/xcomponent.cxx b/test/source/lang/xcomponent.cxx
index ef0049d5953c..abe5111e4f2a 100644
--- a/test/source/lang/xcomponent.cxx
+++ b/test/source/lang/xcomponent.cxx
@@ -10,11 +10,10 @@
#include <cppuhelper/implbase.hxx>
#include <test/lang/xcomponent.hxx>
-#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/lang/xserviceinfo.cxx b/test/source/lang/xserviceinfo.cxx
index 3f7e6541fa85..54a19cf2ac99 100644
--- a/test/source/lang/xserviceinfo.cxx
+++ b/test/source/lang/xserviceinfo.cxx
@@ -8,14 +8,13 @@
*/
#include <test/lang/xserviceinfo.hxx>
-#include <rtl/string.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 6f4d49cc88bd..5c40d47a7719 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -13,7 +13,6 @@
#include <test/screenshot_test.hxx>
-#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/abstdlg.hxx>
@@ -21,7 +20,6 @@
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
-#include <unotools/configmgr.hxx>
#include <tools/stream.hxx>
diff --git a/test/source/setupvcl.cxx b/test/source/setupvcl.cxx
index ff6eec8b8605..81d53b0f2734 100644
--- a/test/source/setupvcl.cxx
+++ b/test/source/setupvcl.cxx
@@ -13,11 +13,9 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <comphelper/processfactory.hxx>
-#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <test/setupvcl.hxx>
-#include <unotools/resmgr.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <vcl/svapp.hxx>
diff --git a/test/source/sheet/cellarealink.cxx b/test/source/sheet/cellarealink.cxx
index 7e64561ab3fc..d73f4e09ce8e 100644
--- a/test/source/sheet/cellarealink.cxx
+++ b/test/source/sheet/cellarealink.cxx
@@ -8,13 +8,11 @@
*/
#include <test/sheet/cellarealink.hxx>
-#include <sfx2/app.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sheet/XAreaLink.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/sheet/cellproperties.cxx b/test/source/sheet/cellproperties.cxx
index 48273f662335..8650eaa85ef9 100644
--- a/test/source/sheet/cellproperties.cxx
+++ b/test/source/sheet/cellproperties.cxx
@@ -10,9 +10,8 @@
#include <test/sheet/cellproperties.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/table/CellVertJustify.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <iostream>
using namespace css;
diff --git a/test/source/sheet/databaseimportdescriptor.cxx b/test/source/sheet/databaseimportdescriptor.cxx
index 482af249e5e9..ea17b871b734 100644
--- a/test/source/sheet/databaseimportdescriptor.cxx
+++ b/test/source/sheet/databaseimportdescriptor.cxx
@@ -17,7 +17,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/databaserange.cxx b/test/source/sheet/databaserange.cxx
index 91ee88184863..7079c8ffa311 100644
--- a/test/source/sheet/databaserange.cxx
+++ b/test/source/sheet/databaserange.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index b8a0a4af77cf..020f33680d3c 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -8,11 +8,6 @@
*/
#include <test/sheet/datapilotfield.hxx>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
-#include <com/sun/star/sheet/XDataPilotTables.hpp>
-#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
@@ -23,7 +18,7 @@
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
#include <rtl/ustring.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <iostream>
using namespace css;
diff --git a/test/source/sheet/datapilotitem.cxx b/test/source/sheet/datapilotitem.cxx
index 1ebb5e885bac..33fe34920ee2 100644
--- a/test/source/sheet/datapilotitem.cxx
+++ b/test/source/sheet/datapilotitem.cxx
@@ -10,11 +10,10 @@
#include <test/sheet/datapilotitem.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/documentsettings.cxx b/test/source/sheet/documentsettings.cxx
index 2f4b31f2a615..644b7273c8b7 100644
--- a/test/source/sheet/documentsettings.cxx
+++ b/test/source/sheet/documentsettings.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/functiondescription.cxx b/test/source/sheet/functiondescription.cxx
index 5b7aeb5ca99a..e90a138e828c 100644
--- a/test/source/sheet/functiondescription.cxx
+++ b/test/source/sheet/functiondescription.cxx
@@ -13,9 +13,8 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sheet/FunctionArgument.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/globalsheetsettings.cxx b/test/source/sheet/globalsheetsettings.cxx
index 0fd2e1aae21d..5018120ae3f5 100644
--- a/test/source/sheet/globalsheetsettings.cxx
+++ b/test/source/sheet/globalsheetsettings.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/scenario.cxx b/test/source/sheet/scenario.cxx
index 6121715c3fd8..dc96e3cc32b6 100644
--- a/test/source/sheet/scenario.cxx
+++ b/test/source/sheet/scenario.cxx
@@ -7,14 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <array>
#include <test/sheet/scenario.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/shape.cxx b/test/source/sheet/shape.cxx
index 9e291be2650b..ab2abec6e8e2 100644
--- a/test/source/sheet/shape.cxx
+++ b/test/source/sheet/shape.cxx
@@ -18,7 +18,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetcell.cxx b/test/source/sheet/sheetcell.cxx
index a8123ea5084a..e30847367b7d 100644
--- a/test/source/sheet/sheetcell.cxx
+++ b/test/source/sheet/sheetcell.cxx
@@ -13,7 +13,6 @@
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/sheet/ValidationType.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
@@ -22,7 +21,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetcellrange.cxx b/test/source/sheet/sheetcellrange.cxx
index 8c6ee09fc470..93d121b3b46d 100644
--- a/test/source/sheet/sheetcellrange.cxx
+++ b/test/source/sheet/sheetcellrange.cxx
@@ -20,7 +20,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetcellranges.cxx b/test/source/sheet/sheetcellranges.cxx
index 5b04acacd38b..d48d28e0011b 100644
--- a/test/source/sheet/sheetcellranges.cxx
+++ b/test/source/sheet/sheetcellranges.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/sheet/sheetcellranges.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -18,7 +17,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetfilterdescriptor.cxx b/test/source/sheet/sheetfilterdescriptor.cxx
index b5618e75d62a..3a0b1364d574 100644
--- a/test/source/sheet/sheetfilterdescriptor.cxx
+++ b/test/source/sheet/sheetfilterdescriptor.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetlink.cxx b/test/source/sheet/sheetlink.cxx
index 9d47b5f71e0f..de6a2148e9d6 100644
--- a/test/source/sheet/sheetlink.cxx
+++ b/test/source/sheet/sheetlink.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/sheetsortdescriptor2.cxx b/test/source/sheet/sheetsortdescriptor2.cxx
index 85ca8706cd4c..3f84d9577f08 100644
--- a/test/source/sheet/sheetsortdescriptor2.cxx
+++ b/test/source/sheet/sheetsortdescriptor2.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
+//#include <test/cppunitasserthelper.hxx>
#include <test/sheet/sheetsortdescriptor2.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -17,7 +17,9 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
+
+#include <vector>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/spreadsheet.cxx b/test/source/sheet/spreadsheet.cxx
index 6ff83c475e46..8e2ca12cf867 100644
--- a/test/source/sheet/spreadsheet.cxx
+++ b/test/source/sheet/spreadsheet.cxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/spreadsheetdocumentsettings.cxx b/test/source/sheet/spreadsheetdocumentsettings.cxx
index cb68576a34de..a1eec4d0de28 100644
--- a/test/source/sheet/spreadsheetdocumentsettings.cxx
+++ b/test/source/sheet/spreadsheetdocumentsettings.cxx
@@ -18,7 +18,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/spreadsheetviewsettings.cxx b/test/source/sheet/spreadsheetviewsettings.cxx
index 68f1d043d235..b77bcb4c6921 100644
--- a/test/source/sheet/spreadsheetviewsettings.cxx
+++ b/test/source/sheet/spreadsheetviewsettings.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/subtotaldescriptor.cxx b/test/source/sheet/subtotaldescriptor.cxx
index 2442648aa39c..e9dffdb75236 100644
--- a/test/source/sheet/subtotaldescriptor.cxx
+++ b/test/source/sheet/subtotaldescriptor.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/tableautoformat.cxx b/test/source/sheet/tableautoformat.cxx
index ed1424482cb6..2d5595f0a2c1 100644
--- a/test/source/sheet/tableautoformat.cxx
+++ b/test/source/sheet/tableautoformat.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/tablevalidation.cxx b/test/source/sheet/tablevalidation.cxx
index 6c0852bb15fe..4383019602e5 100644
--- a/test/source/sheet/tablevalidation.cxx
+++ b/test/source/sheet/tablevalidation.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xactivationbroadcaster.cxx b/test/source/sheet/xactivationbroadcaster.cxx
index f0f9b84c5a62..93fa5ab93689 100644
--- a/test/source/sheet/xactivationbroadcaster.cxx
+++ b/test/source/sheet/xactivationbroadcaster.cxx
@@ -19,7 +19,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xarealink.cxx b/test/source/sheet/xarealink.cxx
index 28c455bab3d3..77e9cb98b867 100644
--- a/test/source/sheet/xarealink.cxx
+++ b/test/source/sheet/xarealink.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xarealinks.cxx b/test/source/sheet/xarealinks.cxx
index b07a2dc0eb4b..f52dcc35b1da 100644
--- a/test/source/sheet/xarealinks.cxx
+++ b/test/source/sheet/xarealinks.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xarrayformularange.cxx b/test/source/sheet/xarrayformularange.cxx
index 26ca5f1d4828..ab4ed7847a3a 100644
--- a/test/source/sheet/xarrayformularange.cxx
+++ b/test/source/sheet/xarrayformularange.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcalculatable.cxx b/test/source/sheet/xcalculatable.cxx
index 4ee1cd800630..a63669b1727d 100644
--- a/test/source/sheet/xcalculatable.cxx
+++ b/test/source/sheet/xcalculatable.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcelladdressable.cxx b/test/source/sheet/xcelladdressable.cxx
index eeb7ea85f5de..fe70f8877724 100644
--- a/test/source/sheet/xcelladdressable.cxx
+++ b/test/source/sheet/xcelladdressable.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/sheet/XCellAddressable.hpp>
#include <com/sun/star/table/CellAddress.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcellformatrangessupplier.cxx b/test/source/sheet/xcellformatrangessupplier.cxx
index 109b13b036d2..d4390b5385d9 100644
--- a/test/source/sheet/xcellformatrangessupplier.cxx
+++ b/test/source/sheet/xcellformatrangessupplier.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/sheet/XCellFormatRangesSupplier.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xcellrangeaddressable.cxx b/test/source/sheet/xcellrangeaddressable.cxx
index 0e46b10c5bd3..179a56fa1f09 100644
--- a/test/source/sheet/xcellrangeaddressable.cxx
+++ b/test/source/sheet/xcellrangeaddressable.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xcellrangedata.cxx b/test/source/sheet/xcellrangedata.cxx
index cc8345ab26e9..6bd8f0f85171 100644
--- a/test/source/sheet/xcellrangedata.cxx
+++ b/test/source/sheet/xcellrangedata.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xcellrangeformula.cxx b/test/source/sheet/xcellrangeformula.cxx
index 14b89b0d0ad5..6de60149938f 100644
--- a/test/source/sheet/xcellrangeformula.cxx
+++ b/test/source/sheet/xcellrangeformula.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcellrangemovement.cxx b/test/source/sheet/xcellrangemovement.cxx
index 93fa2dd2a1cc..ac25a4603ef7 100644
--- a/test/source/sheet/xcellrangemovement.cxx
+++ b/test/source/sheet/xcellrangemovement.cxx
@@ -16,12 +16,9 @@
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/XColumnRowRange.hpp>
-#include <com/sun/star/table/XTableRows.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcellrangereferrer.cxx b/test/source/sheet/xcellrangereferrer.cxx
index 7ce7dd384a95..3d286d558945 100644
--- a/test/source/sheet/xcellrangereferrer.cxx
+++ b/test/source/sheet/xcellrangereferrer.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xcellrangesquery.cxx b/test/source/sheet/xcellrangesquery.cxx
index d123763d18b1..e8e1b4724cba 100644
--- a/test/source/sheet/xcellrangesquery.cxx
+++ b/test/source/sheet/xcellrangesquery.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/sheet/CellFlags.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xcellseries.cxx b/test/source/sheet/xcellseries.cxx
index 8ef20fc6c950..3aff084f8e7c 100644
--- a/test/source/sheet/xcellseries.cxx
+++ b/test/source/sheet/xcellseries.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/sheet/XCellSeries.hpp>
#include <com/sun/star/table/XCellRange.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xconsolidatable.cxx b/test/source/sheet/xconsolidatable.cxx
index 48db7dfe52df..0efa16b6972c 100644
--- a/test/source/sheet/xconsolidatable.cxx
+++ b/test/source/sheet/xconsolidatable.cxx
@@ -9,12 +9,11 @@
#include <test/sheet/xconsolidatable.hxx>
-#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/XConsolidatable.hpp>
#include <com/sun/star/sheet/XConsolidationDescriptor.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xconsolidationdescriptor.cxx b/test/source/sheet/xconsolidationdescriptor.cxx
index 5161c500d1c1..455533c23695 100644
--- a/test/source/sheet/xconsolidationdescriptor.cxx
+++ b/test/source/sheet/xconsolidationdescriptor.cxx
@@ -17,7 +17,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 074f4c178338..933425c040d6 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -9,14 +9,10 @@
#include <test/sheet/xdatabaserange.hxx>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSubTotalDescriptor.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sheet/XDatabaseRange.hpp>
-#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
#include <com/sun/star/table/XCell.hpp>
@@ -24,7 +20,7 @@
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <rtl/ustring.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <iostream>
using namespace css;
diff --git a/test/source/sheet/xdatabaseranges.cxx b/test/source/sheet/xdatabaseranges.cxx
index 491e980fc468..650a0faa3943 100644
--- a/test/source/sheet/xdatabaseranges.cxx
+++ b/test/source/sheet/xdatabaseranges.cxx
@@ -7,8 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <random>
-
#include <test/sheet/xdatabaseranges.hxx>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
@@ -16,7 +14,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatapilotdescriptor.cxx b/test/source/sheet/xdatapilotdescriptor.cxx
index 8806735636e2..aa333a073c72 100644
--- a/test/source/sheet/xdatapilotdescriptor.cxx
+++ b/test/source/sheet/xdatapilotdescriptor.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <rtl/ustring.hxx>
diff --git a/test/source/sheet/xdatapilotfield.cxx b/test/source/sheet/xdatapilotfield.cxx
index 1c79e28a8eee..9f14709e61e3 100644
--- a/test/source/sheet/xdatapilotfield.cxx
+++ b/test/source/sheet/xdatapilotfield.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/sheet/XDataPilotField.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatapilotfieldgrouping.cxx b/test/source/sheet/xdatapilotfieldgrouping.cxx
index c3a9fcc46084..d3ca40d13df1 100644
--- a/test/source/sheet/xdatapilotfieldgrouping.cxx
+++ b/test/source/sheet/xdatapilotfieldgrouping.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatapilottable.cxx b/test/source/sheet/xdatapilottable.cxx
index 50d6cb80d7fb..5934532dcc85 100644
--- a/test/source/sheet/xdatapilottable.cxx
+++ b/test/source/sheet/xdatapilottable.cxx
@@ -8,17 +8,8 @@
*/
#include <test/sheet/xdatapilottable.hxx>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
-#include <com/sun/star/sheet/XDataPilotTables.hpp>
#include <com/sun/star/sheet/XDataPilotTable.hpp>
-#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-#include <rtl/ustring.hxx>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatapilottable2.cxx b/test/source/sheet/xdatapilottable2.cxx
index 98ecf2742453..f894743dc8a1 100644
--- a/test/source/sheet/xdatapilottable2.cxx
+++ b/test/source/sheet/xdatapilottable2.cxx
@@ -9,7 +9,6 @@
#include <test/sheet/xdatapilottable2.hxx>
#include <com/sun/star/sheet/XDataPilotTable2.hpp>
-#include <com/sun/star/sheet/XDataPilotTable.hpp>
#include <com/sun/star/sheet/DataPilotTableResultData.hpp>
#include <com/sun/star/sheet/XDataPilotDescriptor.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
@@ -21,7 +20,7 @@
#include <com/sun/star/sheet/XCellRangeData.hpp>
#include <com/sun/star/sheet/DataResult.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <numeric>
using namespace css;
diff --git a/test/source/sheet/xdatapilottables.cxx b/test/source/sheet/xdatapilottables.cxx
index 16eac73ba8f7..b666650eaa71 100644
--- a/test/source/sheet/xdatapilottables.cxx
+++ b/test/source/sheet/xdatapilottables.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdatapilottablessupplier.cxx b/test/source/sheet/xdatapilottablessupplier.cxx
index 36b7b8821587..66b8d44cad63 100644
--- a/test/source/sheet/xdatapilottablessupplier.cxx
+++ b/test/source/sheet/xdatapilottablessupplier.cxx
@@ -13,8 +13,6 @@
#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xddelink.cxx b/test/source/sheet/xddelink.cxx
index 4227c3b4c9a4..cf56fe9cdc6d 100644
--- a/test/source/sheet/xddelink.cxx
+++ b/test/source/sheet/xddelink.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/sheet/XDDELink.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xddelinks.cxx b/test/source/sheet/xddelinks.cxx
index 1115a29b828b..fc18a16a1eb9 100644
--- a/test/source/sheet/xddelinks.cxx
+++ b/test/source/sheet/xddelinks.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xdocumentauditing.cxx b/test/source/sheet/xdocumentauditing.cxx
index f1cb9539cd92..acbab0968397 100644
--- a/test/source/sheet/xdocumentauditing.cxx
+++ b/test/source/sheet/xdocumentauditing.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sheet/XDocumentAuditing.hpp>
#include <com/sun/star/sheet/XSheetAuditing.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -34,7 +33,7 @@
#include <comphelper/processfactory.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xformulaquery.cxx b/test/source/sheet/xformulaquery.cxx
index a5e74f0cf68f..32540847e0e9 100644
--- a/test/source/sheet/xformulaquery.cxx
+++ b/test/source/sheet/xformulaquery.cxx
@@ -18,7 +18,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xfunctiondescriptions.cxx b/test/source/sheet/xfunctiondescriptions.cxx
index d8cfd17d28f4..1b4ef645e2e7 100644
--- a/test/source/sheet/xfunctiondescriptions.cxx
+++ b/test/source/sheet/xfunctiondescriptions.cxx
@@ -11,13 +11,12 @@
#include <test/sheet/xfunctiondescriptions.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/sheet/XFunctionDescriptions.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace com::sun::star;
diff --git a/test/source/sheet/xgoalseek.cxx b/test/source/sheet/xgoalseek.cxx
index 42570334442a..986af40561d3 100644
--- a/test/source/sheet/xgoalseek.cxx
+++ b/test/source/sheet/xgoalseek.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/sheet/GoalResult.hpp>
#include <com/sun/star/table/CellAddress.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xheaderfootercontent.cxx b/test/source/sheet/xheaderfootercontent.cxx
index 572d23f03ee4..1683cc7e771c 100644
--- a/test/source/sheet/xheaderfootercontent.cxx
+++ b/test/source/sheet/xheaderfootercontent.cxx
@@ -8,13 +8,12 @@
*/
#include <test/sheet/xheaderfootercontent.hxx>
-#include <test/cppunitasserthelper.hxx>
#include <com/sun/star/sheet/XHeaderFooterContent.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xlabelrange.cxx b/test/source/sheet/xlabelrange.cxx
index 8af4026d316b..ed719512356c 100644
--- a/test/source/sheet/xlabelrange.cxx
+++ b/test/source/sheet/xlabelrange.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xlabelranges.cxx b/test/source/sheet/xlabelranges.cxx
index c66ae751e111..36e2edb45eb9 100644
--- a/test/source/sheet/xlabelranges.cxx
+++ b/test/source/sheet/xlabelranges.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xmultiformulatokens.cxx b/test/source/sheet/xmultiformulatokens.cxx
index 3478c0188602..54e8a4e8803d 100644
--- a/test/source/sheet/xmultiformulatokens.cxx
+++ b/test/source/sheet/xmultiformulatokens.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/sheet/xmultipleoperation.cxx b/test/source/sheet/xmultipleoperation.cxx
index 87c8e7c44996..d97f269340d5 100644
--- a/test/source/sheet/xmultipleoperation.cxx
+++ b/test/source/sheet/xmultipleoperation.cxx
@@ -17,9 +17,8 @@
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xnamedrange.cxx b/test/source/sheet/xnamedrange.cxx
index 1e63aedb3f80..3647a859b81d 100644
--- a/test/source/sheet/xnamedrange.cxx
+++ b/test/source/sheet/xnamedrange.cxx
@@ -9,23 +9,11 @@
#include <test/sheet/xnamedrange.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/table/XCellRange.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 <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <rtl/ustring.hxx>
using namespace css;
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index 2017c7c849ac..3faa61893aa2 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -10,7 +10,6 @@
#include <test/sheet/xnamedranges.hxx>
#include <rtl/ustring.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/sheet/Border.hpp>
#include <com/sun/star/sheet/NamedRangeFlag.hpp>
@@ -18,17 +17,14 @@
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
#include <com/sun/star/sheet/XNamedRange.hpp>
#include <com/sun/star/sheet/XNamedRanges.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <iostream>
diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx
index 9643b0afcd76..8c5ffe3d055f 100644
--- a/test/source/sheet/xprintareas.cxx
+++ b/test/source/sheet/xprintareas.cxx
@@ -10,8 +10,7 @@
#include <test/sheet/xprintareas.hxx>
#include <com/sun/star/sheet/XPrintAreas.hpp>
-#include <cppunit/extensions/HelperMacros.h>
-#include <rtl/ustring.hxx>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xrecentfunctions.cxx b/test/source/sheet/xrecentfunctions.cxx
index 209c5e56e33d..7dded7f3516c 100644
--- a/test/source/sheet/xrecentfunctions.cxx
+++ b/test/source/sheet/xrecentfunctions.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xscenario.cxx b/test/source/sheet/xscenario.cxx
index 96dca2a21cf8..9d874d95175d 100644
--- a/test/source/sheet/xscenario.cxx
+++ b/test/source/sheet/xscenario.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xscenarioenhanced.cxx b/test/source/sheet/xscenarioenhanced.cxx
index e6c9568d142e..ed4d934b6c4f 100644
--- a/test/source/sheet/xscenarioenhanced.cxx
+++ b/test/source/sheet/xscenarioenhanced.cxx
@@ -10,14 +10,13 @@
#include <test/sheet/xscenarioenhanced.hxx>
#include <test/cppunitasserthelper.hxx>
-#include <com/sun/star/sheet/XScenarios.hpp>
#include <com/sun/star/sheet/XScenarioEnhanced.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xscenarios.cxx b/test/source/sheet/xscenarios.cxx
index e8d007a8a1ff..d2335dda7e9b 100644
--- a/test/source/sheet/xscenarios.cxx
+++ b/test/source/sheet/xscenarios.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xscenariossupplier.cxx b/test/source/sheet/xscenariossupplier.cxx
index 594d96c9d94b..3b9ff68d4976 100644
--- a/test/source/sheet/xscenariossupplier.cxx
+++ b/test/source/sheet/xscenariossupplier.cxx
@@ -13,8 +13,6 @@
#include <com/sun/star/sheet/XScenariosSupplier.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index f7cc444a2734..1ce4e1a7969d 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/table/CellAddress.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <rtl/ustring.hxx>
using namespace css;
diff --git a/test/source/sheet/xsheetannotationanchor.cxx b/test/source/sheet/xsheetannotationanchor.cxx
index 540d1fca4741..9fbf4b00d2a0 100644
--- a/test/source/sheet/xsheetannotationanchor.cxx
+++ b/test/source/sheet/xsheetannotationanchor.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetannotations.cxx b/test/source/sheet/xsheetannotations.cxx
index 07ea6d493ef9..9f082eeb903c 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/text/XTextRange.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <rtl/ustring.hxx>
using namespace css;
diff --git a/test/source/sheet/xsheetannotationshapesupplier.cxx b/test/source/sheet/xsheetannotationshapesupplier.cxx
index 77f5fc594bc3..9b2cd6d773ee 100644
--- a/test/source/sheet/xsheetannotationshapesupplier.cxx
+++ b/test/source/sheet/xsheetannotationshapesupplier.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetannotationssupplier.cxx b/test/source/sheet/xsheetannotationssupplier.cxx
index 8fddc7d4300f..aa6f7fd1ca4d 100644
--- a/test/source/sheet/xsheetannotationssupplier.cxx
+++ b/test/source/sheet/xsheetannotationssupplier.cxx
@@ -13,8 +13,6 @@
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetauditing.cxx b/test/source/sheet/xsheetauditing.cxx
index 82ffbf5c5332..992a7441ce05 100644
--- a/test/source/sheet/xsheetauditing.cxx
+++ b/test/source/sheet/xsheetauditing.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetcellcursor.cxx b/test/source/sheet/xsheetcellcursor.cxx
index 84d3bbe060d6..fcaeb7fe7e79 100644
--- a/test/source/sheet/xsheetcellcursor.cxx
+++ b/test/source/sheet/xsheetcellcursor.cxx
@@ -21,7 +21,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetcellrange.cxx b/test/source/sheet/xsheetcellrange.cxx
index 660bba5963a0..a5714e32458f 100644
--- a/test/source/sheet/xsheetcellrange.cxx
+++ b/test/source/sheet/xsheetcellrange.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetcellrangecontainer.cxx b/test/source/sheet/xsheetcellrangecontainer.cxx
index 3dfa1a5eecd9..3a4f356c7df0 100644
--- a/test/source/sheet/xsheetcellrangecontainer.cxx
+++ b/test/source/sheet/xsheetcellrangecontainer.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetcellranges.cxx b/test/source/sheet/xsheetcellranges.cxx
index cf785634b3a5..d40a47e03289 100644
--- a/test/source/sheet/xsheetcellranges.cxx
+++ b/test/source/sheet/xsheetcellranges.cxx
@@ -9,7 +9,6 @@
#include <test/sheet/xsheetcellranges.hxx>
-#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/sheet/XSheetCellRanges.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
@@ -17,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetcondition.cxx b/test/source/sheet/xsheetcondition.cxx
index a5bc07079b71..9093e8aea7fd 100644
--- a/test/source/sheet/xsheetcondition.cxx
+++ b/test/source/sheet/xsheetcondition.cxx
@@ -13,9 +13,8 @@
#include <com/sun/star/sheet/XSheetCondition.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetconditionalentries.cxx b/test/source/sheet/xsheetconditionalentries.cxx
index 2d50310fec34..8062d42f5f9b 100644
--- a/test/source/sheet/xsheetconditionalentries.cxx
+++ b/test/source/sheet/xsheetconditionalentries.cxx
@@ -9,14 +9,11 @@
#include <test/sheet/xsheetconditionalentries.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/sheet/ConditionOperator.hpp>
#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetconditionalentry.cxx b/test/source/sheet/xsheetconditionalentry.cxx
index d5a4e51af0f9..0523d9be6955 100644
--- a/test/source/sheet/xsheetconditionalentry.cxx
+++ b/test/source/sheet/xsheetconditionalentry.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsheetfilterable.cxx b/test/source/sheet/xsheetfilterable.cxx
index 5c50acac1d41..a6c8b59016ba 100644
--- a/test/source/sheet/xsheetfilterable.cxx
+++ b/test/source/sheet/xsheetfilterable.cxx
@@ -20,7 +20,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetfilterableex.cxx b/test/source/sheet/xsheetfilterableex.cxx
index 5730bde11e18..eeecf737da6c 100644
--- a/test/source/sheet/xsheetfilterableex.cxx
+++ b/test/source/sheet/xsheetfilterableex.cxx
@@ -15,12 +15,10 @@
#include <com/sun/star/sheet/XSheetFilterDescriptor.hpp>
#include <com/sun/star/sheet/XSheetFilterable.hpp>
#include <com/sun/star/sheet/XSheetFilterableEx.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/table/XCellCursor.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetfilterdescriptor.cxx b/test/source/sheet/xsheetfilterdescriptor.cxx
index 71e601372c5e..503cc84f8f4c 100644
--- a/test/source/sheet/xsheetfilterdescriptor.cxx
+++ b/test/source/sheet/xsheetfilterdescriptor.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetfilterdescriptor2.cxx b/test/source/sheet/xsheetfilterdescriptor2.cxx
index 804d61e222ef..fc060f73cb52 100644
--- a/test/source/sheet/xsheetfilterdescriptor2.cxx
+++ b/test/source/sheet/xsheetfilterdescriptor2.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetfilterdescriptor3.cxx b/test/source/sheet/xsheetfilterdescriptor3.cxx
index 818ea2c1f32a..e46a345520ea 100644
--- a/test/source/sheet/xsheetfilterdescriptor3.cxx
+++ b/test/source/sheet/xsheetfilterdescriptor3.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetlinkable.cxx b/test/source/sheet/xsheetlinkable.cxx
index 6608d439514a..aa394a0064e1 100644
--- a/test/source/sheet/xsheetlinkable.cxx
+++ b/test/source/sheet/xsheetlinkable.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/sheet/XSheetLinkable.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetoperation.cxx b/test/source/sheet/xsheetoperation.cxx
index e85783c89526..22015a40d17d 100644
--- a/test/source/sheet/xsheetoperation.cxx
+++ b/test/source/sheet/xsheetoperation.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/sheet/XSheetOperation.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xsheetoutline.cxx b/test/source/sheet/xsheetoutline.cxx
index e8d829b8d1c3..b2c76494a935 100644
--- a/test/source/sheet/xsheetoutline.cxx
+++ b/test/source/sheet/xsheetoutline.cxx
@@ -20,7 +20,7 @@
#include <com/sun/star/sheet/XSheetOutline.hpp>
#include <com/sun/star/sheet/XCellRangesQuery.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <rtl/ustring.hxx>
using namespace css;
diff --git a/test/source/sheet/xsheetpagebreak.cxx b/test/source/sheet/xsheetpagebreak.cxx
index 7f96aa3be557..a1fde311cad1 100644
--- a/test/source/sheet/xsheetpagebreak.cxx
+++ b/test/source/sheet/xsheetpagebreak.cxx
@@ -14,8 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-#include <rtl/ustring.hxx>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xspreadsheet.cxx b/test/source/sheet/xspreadsheet.cxx
index 6b56fb20499a..466f995fe934 100644
--- a/test/source/sheet/xspreadsheet.cxx
+++ b/test/source/sheet/xspreadsheet.cxx
@@ -14,8 +14,6 @@
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xspreadsheetdocument.cxx b/test/source/sheet/xspreadsheetdocument.cxx
index dde2cafc9e8d..fd8f66ab54d8 100644
--- a/test/source/sheet/xspreadsheetdocument.cxx
+++ b/test/source/sheet/xspreadsheetdocument.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/sheet/XSpreadsheets.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xspreadsheets.cxx b/test/source/sheet/xspreadsheets.cxx
index 3f30bfc3da22..14e2bf9965ae 100644
--- a/test/source/sheet/xspreadsheets.cxx
+++ b/test/source/sheet/xspreadsheets.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/sheet/XSpreadsheets.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xspreadsheets2.cxx b/test/source/sheet/xspreadsheets2.cxx
index dee4e3136a09..d67e871f0d69 100644
--- a/test/source/sheet/xspreadsheets2.cxx
+++ b/test/source/sheet/xspreadsheets2.cxx
@@ -13,27 +13,19 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheets2.hpp>
-#include <com/sun/star/table/XCellRange.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/container/XIndexAccess.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/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/table/CellVertJustify.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <rtl/ustring.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/sheet/xspreadsheetview.cxx b/test/source/sheet/xspreadsheetview.cxx
index 236d2870f709..d8804cf5d956 100644
--- a/test/source/sheet/xspreadsheetview.cxx
+++ b/test/source/sheet/xspreadsheetview.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/sheet/XSpreadsheetView.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsubtotalcalculatable.cxx b/test/source/sheet/xsubtotalcalculatable.cxx
index 5bca1dc7498a..3a85c923bfaf 100644
--- a/test/source/sheet/xsubtotalcalculatable.cxx
+++ b/test/source/sheet/xsubtotalcalculatable.cxx
@@ -18,7 +18,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsubtotaldescriptor.cxx b/test/source/sheet/xsubtotaldescriptor.cxx
index df81eb92fb39..fa5aca6345b0 100644
--- a/test/source/sheet/xsubtotaldescriptor.cxx
+++ b/test/source/sheet/xsubtotaldescriptor.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xsubtotalfield.cxx b/test/source/sheet/xsubtotalfield.cxx
index dfd48f849e6e..048d005dce23 100644
--- a/test/source/sheet/xsubtotalfield.cxx
+++ b/test/source/sheet/xsubtotalfield.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xuniquecellformatrangessupplier.cxx b/test/source/sheet/xuniquecellformatrangessupplier.cxx
index 379edbbedbed..18d81eb2f8ee 100644
--- a/test/source/sheet/xuniquecellformatrangessupplier.cxx
+++ b/test/source/sheet/xuniquecellformatrangessupplier.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/sheet/XUniqueCellFormatRangesSupplier.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xusedareacursor.cxx b/test/source/sheet/xusedareacursor.cxx
index 4ef310e2f398..dcee0cf57efc 100644
--- a/test/source/sheet/xusedareacursor.cxx
+++ b/test/source/sheet/xusedareacursor.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xviewfreezable.cxx b/test/source/sheet/xviewfreezable.cxx
index 3134e22fe9de..4a478f1ef149 100644
--- a/test/source/sheet/xviewfreezable.cxx
+++ b/test/source/sheet/xviewfreezable.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/sheet/XViewFreezable.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/sheet/xviewsplitable.cxx b/test/source/sheet/xviewsplitable.cxx
index d88122f584f6..e9f8d62b899a 100644
--- a/test/source/sheet/xviewsplitable.cxx
+++ b/test/source/sheet/xviewsplitable.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/sheet/XViewSplitable.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/style/xstyleloader.cxx b/test/source/style/xstyleloader.cxx
index 725351b2bbe5..573bc1e16152 100644
--- a/test/source/style/xstyleloader.cxx
+++ b/test/source/style/xstyleloader.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/table/tablecolumn.cxx b/test/source/table/tablecolumn.cxx
index 3dc50e93e9cb..9f25c39355e4 100644
--- a/test/source/table/tablecolumn.cxx
+++ b/test/source/table/tablecolumn.cxx
@@ -18,7 +18,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/table/tablerow.cxx b/test/source/table/tablerow.cxx
index f07f6e2f67a7..2d14c16253d6 100644
--- a/test/source/table/tablerow.cxx
+++ b/test/source/table/tablerow.cxx
@@ -9,12 +9,9 @@
#include <test/table/tablerow.hxx>
#include <test/unoapi_property_testers.hxx>
-#include <rtl/ustring.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace css;
namespace apitest
diff --git a/test/source/table/xcell.cxx b/test/source/table/xcell.cxx
index 8b1e0bb1b9e0..921ef78bad83 100644
--- a/test/source/table/xcell.cxx
+++ b/test/source/table/xcell.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/table/xcell.hxx>
#include <com/sun/star/table/XCell.hpp>
@@ -15,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/table/xcellcursor.cxx b/test/source/table/xcellcursor.cxx
index a5c9ac446207..a8e7b2be5728 100644
--- a/test/source/table/xcellcursor.cxx
+++ b/test/source/table/xcellcursor.cxx
@@ -7,8 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
-
#include <test/table/xcellcursor.hxx>
#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
@@ -21,7 +19,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/table/xcellrange.cxx b/test/source/table/xcellrange.cxx
index 5f5155aae46e..392904078d81 100644
--- a/test/source/table/xcellrange.cxx
+++ b/test/source/table/xcellrange.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/table/xcolumnrowrange.cxx b/test/source/table/xcolumnrowrange.cxx
index 4f2777affeee..748a4825d12e 100644
--- a/test/source/table/xcolumnrowrange.cxx
+++ b/test/source/table/xcolumnrowrange.cxx
@@ -7,14 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/table/xcolumnrowrange.hxx>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/table/xtablechart.cxx b/test/source/table/xtablechart.cxx
index 6dfb131bd3fd..a1c33ceaba63 100644
--- a/test/source/table/xtablechart.cxx
+++ b/test/source/table/xtablechart.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/table/xtablecharts.cxx b/test/source/table/xtablecharts.cxx
index 05226e55a373..2f11a0d29c47 100644
--- a/test/source/table/xtablecharts.cxx
+++ b/test/source/table/xtablecharts.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/table/xtablechartssupplier.cxx b/test/source/table/xtablechartssupplier.cxx
index c141d8f87d70..047695dfceab 100644
--- a/test/source/table/xtablechartssupplier.cxx
+++ b/test/source/table/xtablechartssupplier.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/table/xtablecolumns.cxx b/test/source/table/xtablecolumns.cxx
index b338ddd0bdb4..0d72a8dd196c 100644
--- a/test/source/table/xtablecolumns.cxx
+++ b/test/source/table/xtablecolumns.cxx
@@ -9,7 +9,6 @@
#include <test/table/xtablecolumns.hxx>
-#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/table/XTableColumns.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
@@ -17,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/table/xtablerows.cxx b/test/source/table/xtablerows.cxx
index ba884281f2c5..c241b2bb88f6 100644
--- a/test/source/table/xtablerows.cxx
+++ b/test/source/table/xtablerows.cxx
@@ -15,7 +15,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/text/baseindex.cxx b/test/source/text/baseindex.cxx
index f65028b49977..79ec57270af5 100644
--- a/test/source/text/baseindex.cxx
+++ b/test/source/text/baseindex.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
@@ -15,14 +15,12 @@
#include <com/sun/star/text/XTextSection.hpp>
#include <vcl/BitmapTools.hxx>
-#include <vcl/graph.hxx>
#include <vcl/pngwrite.hxx>
#include <unotools/tempfile.hxx>
#include <tools/stream.hxx>
#include <test/unoapi_property_testers.hxx>
#include <test/text/baseindex.hxx>
-#include <test/testdllapi.hxx>
namespace
{
diff --git a/test/source/text/textcontent.cxx b/test/source/text/textcontent.cxx
index 36451bb7a37f..132981b2ac65 100644
--- a/test/source/text/textcontent.cxx
+++ b/test/source/text/textcontent.cxx
@@ -16,7 +16,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/text/textsettings.cxx b/test/source/text/textsettings.cxx
index 88e78d98a5a8..880206e0963d 100644
--- a/test/source/text/textsettings.cxx
+++ b/test/source/text/textsettings.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/test/source/text/xdocumentindex.cxx b/test/source/text/xdocumentindex.cxx
index 0cae3a2986c6..9f9ad73c83a3 100644
--- a/test/source/text/xdocumentindex.cxx
+++ b/test/source/text/xdocumentindex.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <com/sun/star/text/XTextDocument.hpp>
#include <com/sun/star/text/XTextContent.hpp>
@@ -15,7 +15,6 @@
#include <com/sun/star/text/XDocumentIndex.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <test/unoapi_property_testers.hxx>
#include <test/text/xdocumentindex.hxx>
namespace apitest
diff --git a/test/source/text/xsimpletext.cxx b/test/source/text/xsimpletext.cxx
index a3c1bbc1bfd1..23ea6c785eeb 100644
--- a/test/source/text/xsimpletext.cxx
+++ b/test/source/text/xsimpletext.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/ControlCharacter.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/text/xtextcontent.cxx b/test/source/text/xtextcontent.cxx
index 2f0686b094b3..b4b60aaead52 100644
--- a/test/source/text/xtextcontent.cxx
+++ b/test/source/text/xtextcontent.cxx
@@ -11,7 +11,7 @@
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
using namespace css::uno;
diff --git a/test/source/text/xtextfield.cxx b/test/source/text/xtextfield.cxx
index 87fff9db3f83..ceefcceed827 100644
--- a/test/source/text/xtextfield.cxx
+++ b/test/source/text/xtextfield.cxx
@@ -8,13 +8,12 @@
*/
#include <test/text/xtextfield.hxx>
-#include <rtl/string.hxx>
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/text/xtextrange.cxx b/test/source/text/xtextrange.cxx
index 6eaa4123c217..64428b476e6e 100644
--- a/test/source/text/xtextrange.cxx
+++ b/test/source/text/xtextrange.cxx
@@ -8,12 +8,11 @@
*/
#include <test/text/xtextrange.hxx>
-#include <rtl/string.hxx>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/text/XTextRange.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/unoapi_property_testers.cxx b/test/source/unoapi_property_testers.cxx
index 823972d25afd..f261c4ce3736 100644
--- a/test/source/unoapi_property_testers.cxx
+++ b/test/source/unoapi_property_testers.cxx
@@ -10,7 +10,7 @@
#include <test/unoapi_property_testers.hxx>
#include <com/sun/star/uno/Any.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/util/searchdescriptor.cxx b/test/source/util/searchdescriptor.cxx
index a2b72ce588dc..d8299455835d 100644
--- a/test/source/util/searchdescriptor.cxx
+++ b/test/source/util/searchdescriptor.cxx
@@ -14,8 +14,6 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
-
using namespace css;
namespace apitest
diff --git a/test/source/util/xindent.cxx b/test/source/util/xindent.cxx
index 1bbc9da57195..6b15407f970f 100644
--- a/test/source/util/xindent.cxx
+++ b/test/source/util/xindent.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/util/xindent.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -16,7 +15,7 @@
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/util/xmergeable.cxx b/test/source/util/xmergeable.cxx
index a0c99c186718..211b2b67f4fa 100644
--- a/test/source/util/xmergeable.cxx
+++ b/test/source/util/xmergeable.cxx
@@ -7,14 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <test/cppunitasserthelper.hxx>
#include <test/util/xmergeable.hxx>
#include <com/sun/star/util/XMergeable.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/util/xrefreshable.cxx b/test/source/util/xrefreshable.cxx
index 4e6d2374a57f..f448d93e5008 100644
--- a/test/source/util/xrefreshable.cxx
+++ b/test/source/util/xrefreshable.cxx
@@ -18,7 +18,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/test/source/util/xreplaceable.cxx b/test/source/util/xreplaceable.cxx
index 76d3516ee5fb..ac9d1a4dc66d 100644
--- a/test/source/util/xreplaceable.cxx
+++ b/test/source/util/xreplaceable.cxx
@@ -12,7 +12,7 @@
#include <com/sun/star/util/XReplaceable.hpp>
#include <com/sun/star/util/XReplaceDescriptor.hpp>
#include <com/sun/star/util/XSearchDescriptor.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <iostream>
diff --git a/test/source/util/xreplacedescriptor.cxx b/test/source/util/xreplacedescriptor.cxx
index 15733cc6f252..b3b042a2d826 100644
--- a/test/source/util/xreplacedescriptor.cxx
+++ b/test/source/util/xreplacedescriptor.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/util/xsearchable.cxx b/test/source/util/xsearchable.cxx
index e0775ff72743..b636377d8ed2 100644
--- a/test/source/util/xsearchable.cxx
+++ b/test/source/util/xsearchable.cxx
@@ -10,7 +10,7 @@
#include <com/sun/star/util/XSearchable.hpp>
#include <com/sun/star/util/XSearchDescriptor.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
#include <test/util/xsearchable.hxx>
diff --git a/test/source/util/xsearchdescriptor.cxx b/test/source/util/xsearchdescriptor.cxx
index b42ed7f90a44..2740b2e266c9 100644
--- a/test/source/util/xsearchdescriptor.cxx
+++ b/test/source/util/xsearchdescriptor.cxx
@@ -13,7 +13,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/vclbootstrapprotector.cxx b/test/source/vclbootstrapprotector.cxx
index 18d9a5fecac2..99777f6b483c 100644
--- a/test/source/vclbootstrapprotector.cxx
+++ b/test/source/vclbootstrapprotector.cxx
@@ -10,15 +10,12 @@
#include <sal/config.h>
#include <cppunit/Protector.h>
-#include <cppunittester/protectorfactory.hxx>
#include <sal/types.h>
#include <sal/log.hxx>
#include <test/setupvcl.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/threadpool.hxx>
-#include "isheadless.hxx"
-
namespace {
class Protector: public CppUnit::Protector {
diff --git a/test/source/view/xcontrolaccess.cxx b/test/source/view/xcontrolaccess.cxx
index 8ebf781a9732..1e7583f2b137 100644
--- a/test/source/view/xcontrolaccess.cxx
+++ b/test/source/view/xcontrolaccess.cxx
@@ -14,7 +14,6 @@
#include <com/sun/star/awt/XControlModel.hpp>
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
@@ -23,7 +22,7 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
diff --git a/test/source/view/xformlayeraccess.cxx b/test/source/view/xformlayeraccess.cxx
index 9994066ee32c..68903fcc02e7 100644
--- a/test/source/view/xformlayeraccess.cxx
+++ b/test/source/view/xformlayeraccess.cxx
@@ -9,13 +9,12 @@
#include <test/view/xformlayeraccess.hxx>
-#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <com/sun/star/view/XFormLayerAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
-#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/TestAssert.h>
using namespace css;
More information about the Libreoffice-commits
mailing list