diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-10-27 14:20:45 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-10-27 17:00:03 +0200 |
| commit | fea331bd4ed15288a80c09338a5ca481f9656235 (patch) | |
| tree | 197d1b5e33667c0b13188f830fe542b60879933e /sw | |
| parent | 3c0d04344321db2f7dc1db13ea72590884704f9f (diff) | |
sw: run uiwriter tests on macOS too
meanwhile, fix the following warning:
- sw/qa/extras/uiwriter/uiwriter2.cxx:3744:22:
error: unused variable 'pTextDoc' [-Werror,-Wunused-variable]
Change-Id: I81befe70f48b49f92ea787ab59098525b4cc4471
Change-Id: Ic6ac9b6eaa0ae7a351320540522093ad1dfcba94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124279
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Module_sw.mk | 10 | ||||
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter2.cxx | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index d0f5e63bb0c3..da25613e7ace 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -107,12 +107,10 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ CppunitTest_sw_txtexport \ CppunitTest_sw_txtencexport \ CppunitTest_sw_txtimport \ - $(if $(filter-out MACOSX,$(OS)), \ - CppunitTest_sw_uiwriter \ - CppunitTest_sw_uiwriter2 \ - CppunitTest_sw_uiwriter3 \ - CppunitTest_sw_uiwriter4 \ - ) \ + CppunitTest_sw_uiwriter \ + CppunitTest_sw_uiwriter2 \ + CppunitTest_sw_uiwriter3 \ + CppunitTest_sw_uiwriter4 \ CppunitTest_sw_layoutwriter \ CppunitTest_sw_layoutwriter2 \ CppunitTest_sw_mailmerge \ diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx index 41dd0ff9231d..b9904e0d3f3e 100644 --- a/sw/qa/extras/uiwriter/uiwriter2.cxx +++ b/sw/qa/extras/uiwriter/uiwriter2.cxx @@ -3741,7 +3741,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment) // Load a document with an as-char image in it. SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "image-comment.odt"); SwView* pView = pDoc->GetDocShell()->GetView(); - SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // Test document has "before<image>after", remove the content before the image. SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); @@ -3777,6 +3776,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment) pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, SfxCallMode::SYNCHRON); #if !defined(MACOSX) + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); // Calc the left edge of the as-char frame. SwRootFrame* pLayout = pWrtShell->GetLayout(); SwFrame* pPage = pLayout->GetLower(); |