sc/qa/unit/filters-test.cxx | 6 +++---
sc/qa/unit/functions_addin.cxx | 2 +-
sc/qa/unit/functions_array.cxx | 2 +-
sc/qa/unit/functions_database.cxx | 2 +-
sc/qa/unit/functions_datetime.cxx | 2 +-
sc/qa/unit/functions_financial.cxx | 2 +-
sc/qa/unit/functions_information.cxx | 2 +-
sc/qa/unit/functions_logical.cxx | 2 +-
sc/qa/unit/functions_mathematical.cxx | 2 +-
sc/qa/unit/functions_old.cxx | 2 +-
sc/qa/unit/functions_spreadsheet.cxx | 2 +-
sc/qa/unit/functions_statistical.cxx | 2 +-
sc/qa/unit/functions_test.cxx | 4 ++--
sc/qa/unit/functions_test.hxx | 2 +-
sc/qa/unit/functions_text.cxx | 2 +-
sc/qa/unit/helper/qahelper.cxx | 4 ----
sc/qa/unit/helper/qahelper.hxx | 5 -----
17 files changed, 18 insertions(+), 27 deletions(-)
New commits:
commit e09823b549699a9f32b1b0d7621301117306cdc3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Nov 24 13:31:16 2022 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Nov 24 15:39:29 2022 +0100
ScBootstrapFixture: no need to pass basestring anymore
Change-Id: I58ce96af149eb2b7f4d357383b73ec4b1d1b51bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143224
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 596be632595d..fcfbc786f334 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -69,11 +69,11 @@ private:
void ScFiltersTest::createFileURL(
std::u16string_view aFileBase, std::u16string_view aFileExtension,
OUString& rFilePath)
{
- // m_aBaseString and aFileBase may contain multiple segments, so use
+ // aFileBase may contain multiple segments, so use
// GetNewAbsURL instead of insertName for them:
INetURLObject url(m_directories.getSrcRootURL());
url.setFinalSlash();
- url.GetNewAbsURL(m_aBaseString, &url);
+ url.GetNewAbsURL("sc/qa/unit/data", &url);
url.insertName(aFileExtension, true);
url.GetNewAbsURL(OUString::Concat(aFileBase) + aFileExtension, &url);
rFilePath = url.GetMainURL(INetURLObject::DecodeMechanism::NONE);
@@ -155,7 +155,7 @@ void ScFiltersTest::testTooManyColsRows()
}
ScFiltersTest::ScFiltersTest()
- : ScBootstrapFixture( "sc/qa/unit/data" )
+ : ScBootstrapFixture()
{
}
diff --git a/sc/qa/unit/functions_addin.cxx b/sc/qa/unit/functions_addin.cxx
index ce549a400014..4c9189de235d 100644
--- a/sc/qa/unit/functions_addin.cxx
+++ b/sc/qa/unit/functions_addin.cxx
@@ -22,7 +22,7 @@ void AddinFunctionsTest::testAddinFormulasFODS()
}
AddinFunctionsTest::AddinFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/addin/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_array.cxx b/sc/qa/unit/functions_array.cxx
index 88a4b70d7c29..7584c4e0b309 100644
--- a/sc/qa/unit/functions_array.cxx
+++ b/sc/qa/unit/functions_array.cxx
@@ -38,7 +38,7 @@ void ArrayFunctionsTest::testDubiousArrayFormulasFODS()
}
ArrayFunctionsTest::ArrayFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/array/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_database.cxx
b/sc/qa/unit/functions_database.cxx
index 933d3dabd976..7bed3b5c956a 100644
--- a/sc/qa/unit/functions_database.cxx
+++ b/sc/qa/unit/functions_database.cxx
@@ -22,7 +22,7 @@ void DatabaseFunctionsTest::testDatabaseFormulasFODS()
}
DatabaseFunctionsTest::DatabaseFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/database/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_datetime.cxx
b/sc/qa/unit/functions_datetime.cxx
index e0c1a304956f..ba7f7ce2c56f 100644
--- a/sc/qa/unit/functions_datetime.cxx
+++ b/sc/qa/unit/functions_datetime.cxx
@@ -22,7 +22,7 @@ void DateTimeFunctionsTest::testDateTimeFormulasFODS()
}
DateTimeFunctionsTest::DateTimeFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/date_time/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_financial.cxx
b/sc/qa/unit/functions_financial.cxx
index 9188e75e0a05..b83b4cd667e6 100644
--- a/sc/qa/unit/functions_financial.cxx
+++ b/sc/qa/unit/functions_financial.cxx
@@ -22,7 +22,7 @@ void FinancialFunctionsTest::testFinancialFormulasFODS()
}
FinancialFunctionsTest::FinancialFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/financial/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_information.cxx
b/sc/qa/unit/functions_information.cxx
index 58aee20bbbea..9d6de422ec5b 100644
--- a/sc/qa/unit/functions_information.cxx
+++ b/sc/qa/unit/functions_information.cxx
@@ -22,7 +22,7 @@ void InformationFunctionsTest::testInformationFormulasFODS()
}
InformationFunctionsTest::InformationFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/information/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_logical.cxx b/sc/qa/unit/functions_logical.cxx
index 15a4db6ed1fd..c501867a0e2c 100644
--- a/sc/qa/unit/functions_logical.cxx
+++ b/sc/qa/unit/functions_logical.cxx
@@ -22,7 +22,7 @@ void LogicalFunctionsTest::testLogicalFormulasFODS()
}
LogicalFunctionsTest::LogicalFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/logical/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_mathematical.cxx
b/sc/qa/unit/functions_mathematical.cxx
index 274a04db523e..9eb940df892c 100644
--- a/sc/qa/unit/functions_mathematical.cxx
+++ b/sc/qa/unit/functions_mathematical.cxx
@@ -22,7 +22,7 @@ void MathematicalFunctionsTest::testMathematicalFormulasFODS()
}
MathematicalFunctionsTest::MathematicalFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/mathematical/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_old.cxx b/sc/qa/unit/functions_old.cxx
index e742f6b972fa..0a3663f988d9 100644
--- a/sc/qa/unit/functions_old.cxx
+++ b/sc/qa/unit/functions_old.cxx
@@ -14,7 +14,7 @@ public:
};
FunctionsTestOld::FunctionsTestOld():
- FunctionsTest("sc/qq/unit/data/functions/fods")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_spreadsheet.cxx
b/sc/qa/unit/functions_spreadsheet.cxx
index 03c87732b604..865134fc31c1 100644
--- a/sc/qa/unit/functions_spreadsheet.cxx
+++ b/sc/qa/unit/functions_spreadsheet.cxx
@@ -22,7 +22,7 @@ void SpreadsheetFunctionsTest::testSpreadsheetFormulasFODS()
}
SpreadsheetFunctionsTest::SpreadsheetFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/spreadsheet/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_statistical.cxx
b/sc/qa/unit/functions_statistical.cxx
index 4d97d4cc1689..8f74aad999fb 100644
--- a/sc/qa/unit/functions_statistical.cxx
+++ b/sc/qa/unit/functions_statistical.cxx
@@ -22,7 +22,7 @@ void StatisticalFunctionsTest::testStatisticalFormulasFODS()
}
StatisticalFunctionsTest::StatisticalFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/statistical/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/functions_test.cxx b/sc/qa/unit/functions_test.cxx
index 02c1cf1da4f4..6bc36540c2a4 100644
--- a/sc/qa/unit/functions_test.cxx
+++ b/sc/qa/unit/functions_test.cxx
@@ -13,8 +13,8 @@
#include <rtl/math.hxx>
-FunctionsTest::FunctionsTest(const OUString& rPath):
- ScBootstrapFixture(rPath)
+FunctionsTest::FunctionsTest():
+ ScBootstrapFixture()
{
}
diff --git a/sc/qa/unit/functions_test.hxx b/sc/qa/unit/functions_test.hxx
index 0a57987dfa01..52672bb8177b 100644
--- a/sc/qa/unit/functions_test.hxx
+++ b/sc/qa/unit/functions_test.hxx
@@ -19,7 +19,7 @@ class SCQAHELPER_DLLPUBLIC FunctionsTest : public
ScBootstrapFixture, public tes
{
public:
- FunctionsTest(const OUString& rPath);
+ FunctionsTest();
virtual bool load(
const OUString &rFilter,
diff --git a/sc/qa/unit/functions_text.cxx b/sc/qa/unit/functions_text.cxx
index 96225593db05..a9bfb8fefbab 100644
--- a/sc/qa/unit/functions_text.cxx
+++ b/sc/qa/unit/functions_text.cxx
@@ -22,7 +22,7 @@ void TextFunctionsTest::testTextFormulasFODS()
}
TextFunctionsTest::TextFunctionsTest():
- FunctionsTest("sc/qa/unit/data/functions/text/fods/")
+ FunctionsTest()
{
}
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index cbeaf9e8ac90..bb263fcc9a44 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -21,7 +21,6 @@
#include <svx/svdpage.hxx>
#include <svx/svdoole2.hxx>
#include <tools/UnitConversion.hxx>
-#include <tools/urlobj.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/justifyitem.hxx>
#include <formula/errorcodes.hxx>
@@ -499,9 +498,6 @@ ScDocShellRef ScBootstrapFixture::load(
return xDocShRef;
}
-ScBootstrapFixture::ScBootstrapFixture( const OUString& rsBaseString ) :
m_aBaseString( rsBaseString ) {}
-ScBootstrapFixture::~ScBootstrapFixture() {}
-
void ScBootstrapFixture::setUp()
{
test::BootstrapFixture::setUp();
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 139c4ff6e89b..3eac1c2c3a86 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -127,8 +127,6 @@ public:
class SCQAHELPER_DLLPUBLIC ScBootstrapFixture : public test::BootstrapFixture
{
protected:
- OUString m_aBaseString;
-
ScDocShellRef load(
const OUString& rURL, const OUString& rFilter, const OUString
&rUserData,
const OUString& rTypeName, SfxFilterFlags nFilterFlags,
SotClipboardFormatId nClipboardID,
@@ -137,9 +135,6 @@ private:
// reference to document interface that we are testing
css::uno::Reference<css::uno::XInterface> m_xCalcComponent;
public:
- explicit ScBootstrapFixture( const OUString& rsBaseString );
- virtual ~ScBootstrapFixture() override;
-
virtual void setUp() override;
virtual void tearDown() override;
};
