diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-05-31 16:46:33 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-05-31 19:08:09 +0200 |
| commit | 6aec73de12a56a56b3ffd9bb86b559bf0609bf58 (patch) | |
| tree | 7c497527958919fed66ab8644ed5d0ff804b5444 /sw/qa | |
| parent | 58ab2f002fd27974b474151b01287dac221dc102 (diff) | |
SwModelTestBase: drop mustCalcLayoutOf
it's not used anywhere since f3294eb1789e9603b5129f0f2d61116fd4853b52
"CppunitTest_sw_htmlexport: remove not needed mustTestImportOf()"
Change-Id: Ifb27c176bd64ca3efecb0f9b142b6144c5703556
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152453
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/htmlexport/htmlexport.cxx | 5 | ||||
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 4 | ||||
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge2.cxx | 4 | ||||
| -rw-r--r-- | sw/qa/inc/swmodeltestbase.hxx | 8 | ||||
| -rw-r--r-- | sw/qa/unit/swmodeltestbase.cxx | 3 |
5 files changed, 3 insertions, 21 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx index 79d4c4f602b9..d16bd6d16d38 100644 --- a/sw/qa/extras/htmlexport/htmlexport.cxx +++ b/sw/qa/extras/htmlexport/htmlexport.cxx @@ -207,11 +207,6 @@ public: } private: - bool mustCalcLayoutOf(const char* filename) override - { - return filename != std::string_view("fdo62336.docx"); - } - virtual std::unique_ptr<Resetter> preTest(const char* filename) override { if (getTestName().indexOf("ReqIf") != -1) diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 0be7c0a8afde..b31662a31271 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -254,10 +254,8 @@ public: std::cout << filename << ","; mnStartTime = osl_getGlobalTimer(); mxComponent = loadFromDesktop(msMailMergeOutputURL + "/" + filename, "com.sun.star.text.TextDocument"); - OString name2 = OUStringToOString( filename, RTL_TEXTENCODING_UTF8 ); discardDumpedLayout(); - if (mustCalcLayoutOf(name2.getStr())) - calcLayout(); + calcLayout(); } /** diff --git a/sw/qa/extras/mailmerge/mailmerge2.cxx b/sw/qa/extras/mailmerge/mailmerge2.cxx index cd8871e780d3..c37946c25341 100644 --- a/sw/qa/extras/mailmerge/mailmerge2.cxx +++ b/sw/qa/extras/mailmerge/mailmerge2.cxx @@ -247,10 +247,8 @@ public: std::cout << filename << ","; mnStartTime = osl_getGlobalTimer(); mxComponent = loadFromDesktop(msMailMergeOutputURL + "/" + filename, "com.sun.star.text.TextDocument"); - OString name2 = OUStringToOString( filename, RTL_TEXTENCODING_UTF8 ); discardDumpedLayout(); - if (mustCalcLayoutOf(name2.getStr())) - calcLayout(); + calcLayout(); } /** diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index 36fd389416ae..244e739eb9ea 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -159,14 +159,6 @@ protected: { } - /** - * Override this function if calc layout is not needed - */ - virtual bool mustCalcLayoutOf(const char* /*filename*/) - { - return true; - } - void dumpLayout(const css::uno::Reference< css::lang::XComponent > & rComponent); void discardDumpedLayout(); diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 85b0e1ed0c59..8095d73ea9ec 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -471,8 +471,7 @@ void SwModelTestBase::loadURL(OUString const& rURL, const char* pName, const cha CPPUNIT_ASSERT(!getSwDocShell()->GetMedium()->GetWarningError()); discardDumpedLayout(); - if (pName && mustCalcLayoutOf(pName)) - calcLayout(); + calcLayout(); } void SwModelTestBase::reload(const char* pFilter, const char* pName, const char* pPassword) |