[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa

[Xisco Fauli (via logerrit)]

 sw/Module_sw.mk                     |   10 ++++------
 sw/qa/extras/uiwriter/uiwriter2.cxx |    2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit fea331bd4ed15288a80c09338a5ca481f9656235
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Oct 27 14:20:45 2021 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Oct 27 17:00:03 2021 +0200

    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 <xiscofa...@libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

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();