From a2c665e4dd73007fe7f0eda2de31db8b768f1df9 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Sat, 6 Jul 2019 01:36:57 +0200 Subject: WIN fix some unit tests more generally Fixes regressed unit test failures from commit 3f7e8ddea89f ("Enable many more unit tests on all archs"). Change-Id: I76a8f7560675b9be3765237f8368d05cff22591d Reviewed-on: https://gerrit.libreoffice.org/75155 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski --- sc/qa/unit/helper/qahelper.cxx | 8 -------- sc/qa/unit/helper/qahelper.hxx | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'sc/qa/unit/helper') diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index b38dcdfac161..c5f183161a78 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -405,8 +405,6 @@ ScRangeList getChartRanges(ScDocument& rDoc, const SdrOle2Obj& rChartObj) return aRanges; } -namespace { - ScTokenArray* getTokens(ScDocument& rDoc, const ScAddress& rPos) { ScFormulaCell* pCell = rDoc.GetFormulaCell(rPos); @@ -420,8 +418,6 @@ ScTokenArray* getTokens(ScDocument& rDoc, const ScAddress& rPos) return pCell->GetCode(); } -} - bool checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* pExpected) { ScTokenArray* pCode = getTokens(rDoc, rPos); @@ -778,15 +774,11 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam const * aTestValues, unsi } } -namespace { - std::string to_std_string(const OUString& rStr) { return std::string(rStr.toUtf8().getStr()); } -} - void checkFormula(ScDocument& rDoc, const ScAddress& rPos, const char* expected, const char* msg, CppUnit::SourceLine const & sourceLine) { ScTokenArray* pCode = getTokens(rDoc, rPos); diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx index 671b3bdcad1b..d0ad00b258d7 100644 --- a/sc/qa/unit/helper/qahelper.hxx +++ b/sc/qa/unit/helper/qahelper.hxx @@ -219,6 +219,10 @@ SCQAHELPER_DLLPUBLIC void checkFormula(ScDocument& rDoc, const ScAddress& rPos, SCQAHELPER_DLLPUBLIC void testFormats(ScBootstrapFixture* pTest, ScDocument* pDoc, sal_Int32 nFormat); +SCQAHELPER_DLLPUBLIC ScTokenArray* getTokens(ScDocument& rDoc, const ScAddress& rPos); + +SCQAHELPER_DLLPUBLIC std::string to_std_string(const OUString& rStr); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit