sw/qa/extras/mailmerge/mailmerge.cxx | 2 --
sw/qa/extras/mailmerge/mailmerge2.cxx | 2 --
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 4 ----
sw/qa/inc/swmodeltestbase.hxx | 6 ------
4 files changed, 14 deletions(-)
New commits:
commit 1afe0df7f3a8d19a034257dcd68e182205dfc649
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jul 12 12:55:53 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jul 12 14:44:07 2023 +0200
sw: getTestName() can go
after
commit 54d69f55d13ec39e1b2a2a6883b98cd23c6609a4
Author: Miklos Vajna <vmik...@collabora.com>
Date: Tue Jul 11 20:11:25 2023 +0200
CppunitTest_sw_htmlexport: clean up not needed reqif part of preTest()
All reqif tests set the filter options explicitly already.
Change-Id: Ib7962578ddb2ce002910868c6d6f85ae4a1f6c79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154353
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index b31662a31271..0089601974e6 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -305,8 +305,6 @@ protected:
#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename,
filter, BaseClass, selection, column) \
class TestName : public BaseClass { \
- protected: \
- virtual OUString getTestName() override { return #TestName; } \
public: \
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(MailMerge); \
diff --git a/sw/qa/extras/mailmerge/mailmerge2.cxx
b/sw/qa/extras/mailmerge/mailmerge2.cxx
index c37946c25341..ddd7b4e35ebe 100644
--- a/sw/qa/extras/mailmerge/mailmerge2.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge2.cxx
@@ -295,8 +295,6 @@ protected:
#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename,
filter, BaseClass, selection, column) \
class TestName : public BaseClass { \
- protected: \
- virtual OUString getTestName() override { return #TestName; } \
public: \
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(MailMerge); \
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index 000f4a607ae5..11b9cc03f4dd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -27,7 +27,6 @@
class TestName : public Test
\
{
\
protected:
\
- virtual OUString getTestName() override { return #TestName; }
\
virtual void postLoad(const char*) override
\
{
\
if (!bUseTempDir)
\
@@ -73,9 +72,6 @@
#define DECLARE_LINKS_IMPORT_TEST(TestName, FileName, bAbsolute)
\
class TestName : public Test
\
{
\
- protected:
\
- virtual OUString getTestName() override { return #TestName; }
\
-
\
public:
\
CPPUNIT_TEST_SUITE(TestName);
\
CPPUNIT_TEST(Import);
\
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index b6ce2f442f8d..e897a398cb86 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -42,8 +42,6 @@
*/
#define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
- protected:\
- virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Load_Verify_Reload_Verify); \
@@ -65,8 +63,6 @@
#define DECLARE_SW_EXPORT_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
- protected:\
- virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import_Export); \
@@ -101,8 +97,6 @@ protected:
sal_uInt32 mnStartTime;
- virtual OUString getTestName() { return OUString(); }
-
/// Copy&paste helper.
void paste(std::u16string_view aFilename, OUString aInstance,
css::uno::Reference<css::text::XTextRange> const& xTextRange);
