summaryrefslogtreecommitdiff
path: root/test/source/sheet
diff options
context:
space:
mode:
Diffstat (limited to 'test/source/sheet')
-rw-r--r--test/source/sheet/cellarealink.cxx4
-rw-r--r--test/source/sheet/cellproperties.cxx3
-rw-r--r--test/source/sheet/databaseimportdescriptor.cxx2
-rw-r--r--test/source/sheet/databaserange.cxx2
-rw-r--r--test/source/sheet/datapilotfield.cxx7
-rw-r--r--test/source/sheet/datapilotitem.cxx3
-rw-r--r--test/source/sheet/documentsettings.cxx2
-rw-r--r--test/source/sheet/functiondescription.cxx3
-rw-r--r--test/source/sheet/globalsheetsettings.cxx2
-rw-r--r--test/source/sheet/scenario.cxx3
-rw-r--r--test/source/sheet/shape.cxx2
-rw-r--r--test/source/sheet/sheetcell.cxx3
-rw-r--r--test/source/sheet/sheetcellrange.cxx2
-rw-r--r--test/source/sheet/sheetcellranges.cxx3
-rw-r--r--test/source/sheet/sheetfilterdescriptor.cxx2
-rw-r--r--test/source/sheet/sheetlink.cxx2
-rw-r--r--test/source/sheet/sheetsortdescriptor2.cxx6
-rw-r--r--test/source/sheet/spreadsheet.cxx2
-rw-r--r--test/source/sheet/spreadsheetdocumentsettings.cxx2
-rw-r--r--test/source/sheet/spreadsheetviewsettings.cxx2
-rw-r--r--test/source/sheet/subtotaldescriptor.cxx2
-rw-r--r--test/source/sheet/tableautoformat.cxx2
-rw-r--r--test/source/sheet/tablevalidation.cxx2
-rw-r--r--test/source/sheet/xactivationbroadcaster.cxx2
-rw-r--r--test/source/sheet/xarealink.cxx2
-rw-r--r--test/source/sheet/xarealinks.cxx2
-rw-r--r--test/source/sheet/xarrayformularange.cxx2
-rw-r--r--test/source/sheet/xcalculatable.cxx2
-rw-r--r--test/source/sheet/xcelladdressable.cxx2
-rw-r--r--test/source/sheet/xcellformatrangessupplier.cxx2
-rw-r--r--test/source/sheet/xcellrangeaddressable.cxx2
-rw-r--r--test/source/sheet/xcellrangedata.cxx2
-rw-r--r--test/source/sheet/xcellrangeformula.cxx2
-rw-r--r--test/source/sheet/xcellrangemovement.cxx5
-rw-r--r--test/source/sheet/xcellrangereferrer.cxx2
-rw-r--r--test/source/sheet/xcellrangesquery.cxx2
-rw-r--r--test/source/sheet/xcellseries.cxx2
-rw-r--r--test/source/sheet/xconsolidatable.cxx3
-rw-r--r--test/source/sheet/xconsolidationdescriptor.cxx2
-rw-r--r--test/source/sheet/xdatabaserange.cxx6
-rw-r--r--test/source/sheet/xdatabaseranges.cxx4
-rw-r--r--test/source/sheet/xdatapilotdescriptor.cxx2
-rw-r--r--test/source/sheet/xdatapilotfield.cxx2
-rw-r--r--test/source/sheet/xdatapilotfieldgrouping.cxx2
-rw-r--r--test/source/sheet/xdatapilottable.cxx9
-rw-r--r--test/source/sheet/xdatapilottable2.cxx3
-rw-r--r--test/source/sheet/xdatapilottables.cxx2
-rw-r--r--test/source/sheet/xdatapilottablessupplier.cxx2
-rw-r--r--test/source/sheet/xddelink.cxx2
-rw-r--r--test/source/sheet/xddelinks.cxx2
-rw-r--r--test/source/sheet/xdocumentauditing.cxx3
-rw-r--r--test/source/sheet/xformulaquery.cxx2
-rw-r--r--test/source/sheet/xfunctiondescriptions.cxx3
-rw-r--r--test/source/sheet/xgoalseek.cxx2
-rw-r--r--test/source/sheet/xheaderfootercontent.cxx3
-rw-r--r--test/source/sheet/xlabelrange.cxx2
-rw-r--r--test/source/sheet/xlabelranges.cxx2
-rw-r--r--test/source/sheet/xmultiformulatokens.cxx2
-rw-r--r--test/source/sheet/xmultipleoperation.cxx3
-rw-r--r--test/source/sheet/xnamedrange.cxx14
-rw-r--r--test/source/sheet/xnamedranges.cxx6
-rw-r--r--test/source/sheet/xprintareas.cxx3
-rw-r--r--test/source/sheet/xrecentfunctions.cxx2
-rw-r--r--test/source/sheet/xscenario.cxx2
-rw-r--r--test/source/sheet/xscenarioenhanced.cxx3
-rw-r--r--test/source/sheet/xscenarios.cxx2
-rw-r--r--test/source/sheet/xscenariossupplier.cxx2
-rw-r--r--test/source/sheet/xsheetannotation.cxx2
-rw-r--r--test/source/sheet/xsheetannotationanchor.cxx2
-rw-r--r--test/source/sheet/xsheetannotations.cxx2
-rw-r--r--test/source/sheet/xsheetannotationshapesupplier.cxx2
-rw-r--r--test/source/sheet/xsheetannotationssupplier.cxx2
-rw-r--r--test/source/sheet/xsheetauditing.cxx2
-rw-r--r--test/source/sheet/xsheetcellcursor.cxx2
-rw-r--r--test/source/sheet/xsheetcellrange.cxx2
-rw-r--r--test/source/sheet/xsheetcellrangecontainer.cxx2
-rw-r--r--test/source/sheet/xsheetcellranges.cxx3
-rw-r--r--test/source/sheet/xsheetcondition.cxx3
-rw-r--r--test/source/sheet/xsheetconditionalentries.cxx5
-rw-r--r--test/source/sheet/xsheetconditionalentry.cxx2
-rw-r--r--test/source/sheet/xsheetfilterable.cxx2
-rw-r--r--test/source/sheet/xsheetfilterableex.cxx4
-rw-r--r--test/source/sheet/xsheetfilterdescriptor.cxx2
-rw-r--r--test/source/sheet/xsheetfilterdescriptor2.cxx2
-rw-r--r--test/source/sheet/xsheetfilterdescriptor3.cxx2
-rw-r--r--test/source/sheet/xsheetlinkable.cxx2
-rw-r--r--test/source/sheet/xsheetoperation.cxx2
-rw-r--r--test/source/sheet/xsheetoutline.cxx2
-rw-r--r--test/source/sheet/xsheetpagebreak.cxx3
-rw-r--r--test/source/sheet/xspreadsheet.cxx2
-rw-r--r--test/source/sheet/xspreadsheetdocument.cxx2
-rw-r--r--test/source/sheet/xspreadsheets.cxx2
-rw-r--r--test/source/sheet/xspreadsheets2.cxx10
-rw-r--r--test/source/sheet/xspreadsheetview.cxx2
-rw-r--r--test/source/sheet/xsubtotalcalculatable.cxx2
-rw-r--r--test/source/sheet/xsubtotaldescriptor.cxx2
-rw-r--r--test/source/sheet/xsubtotalfield.cxx2
-rw-r--r--test/source/sheet/xuniquecellformatrangessupplier.cxx2
-rw-r--r--test/source/sheet/xusedareacursor.cxx2
-rw-r--r--test/source/sheet/xviewfreezable.cxx2
-rw-r--r--test/source/sheet/xviewsplitable.cxx2
101 files changed, 99 insertions, 176 deletions
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;