[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/source sw/qa

[Marco Cecchetti]

 sc/source/ui/view/tabview.cxx                  |    2 +-
 sw/qa/extras/tiledrendering/tiledrendering.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 581ed92d2f180f9303fede629a18627d1dcf57d7
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date:   Fri Apr 27 19:29:01 2018 +0200

    fixing trivial clang errors
    
    Change-Id: Ic6e3df495ca3717d17934d05797a003dd882c076
    Reviewed-on: https://gerrit.libreoffice.org/53572
    Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
    Tested-by: Marco Cecchetti <mrcek...@gmail.com>

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index e2200fcf5323..8edfc4ee2f8f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2437,7 +2437,7 @@ void lcl_createGroupsData(
                 aGroupData += "\"index\": \"" + OUString::number(nIndex) + 
"\", ";
                 aGroupData += "\"startPos\": \"" + 
OUString::number(rGroupStartPositions[nLevel]) + "\", ";
                 aGroupData += "\"endPos\": \"" + OUString::number(nTotalTwips) 
+ "\", ";
-                aGroupData += "\"hidden\": \"" + 
OUString::number(bGroupHidden) + "\" }";
+                aGroupData += "\"hidden\": \"" + 
OUString::number(static_cast<unsigned int>(bGroupHidden)) + "\" }";
 
                 rGroupsBuffer += aGroupData;
 
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b5c6a4b35161..5a653ba48b47 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -970,10 +970,10 @@ void SwTiledRenderingTest::testShapeViewCursors()
     Scheduler::ProcessEventsToIdle();
     // Make sure that aView1 gets a view-only cursor notification, while
     // aView2 gets a real cursor notification.
-    CPPUNIT_ASSERT(aView1.m_aOwnCursor == aLastOwnCursor1);
+    CPPUNIT_ASSERT_EQUAL(aView1.m_aOwnCursor, aLastOwnCursor1);
     CPPUNIT_ASSERT(aView1.m_bViewCursorInvalidated && aLastViewCursor1 != 
aView1.m_aViewCursor);
     CPPUNIT_ASSERT(aView2.m_bOwnCursorInvalidated && aLastOwnCursor2 != 
aView2.m_aOwnCursor);
-    CPPUNIT_ASSERT(aLastViewCursor2 == aView2.m_aViewCursor);
+    CPPUNIT_ASSERT_EQUAL(aLastViewCursor2, aView2.m_aViewCursor);
     mxComponent->dispose();
     mxComponent.clear();
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits