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

Rene Engelhard (via logerrit) logerrit at kemper.freedesktop.org
Fri Jun 18 15:55:17 UTC 2021


 sd/qa/unit/tiledrendering/tiledrendering.cxx   |    8 ++++----
 sw/qa/extras/tiledrendering/tiledrendering.cxx |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 51754ca5349d7bf655d57ded37381188d0bc4bcf
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Fri Jun 18 06:14:09 2021 +0200
Commit:     René Engelhard <rene at debian.org>
CommitDate: Fri Jun 18 17:54:35 2021 +0200

    more 32bit build fixes
    
    Change-Id: I5906ef714a482afffe40e59e90fd709fe857d3ff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117404
    Tested-by: Jenkins
    Tested-by: René Engelhard <rene at debian.org>
    Reviewed-by: René Engelhard <rene at debian.org>

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 02f1968a8232..02856dd0043e 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -2627,7 +2627,7 @@ void SdTiledRenderingTest::testSlideDuplicateUndo()
 namespace
 {
 
-void lcl_extractHandleParameters(const OString& selection, int& id, int& x, int& y)
+void lcl_extractHandleParameters(const OString& selection, sal_uInt32& id, sal_uInt32& x, sal_uInt32& y)
 {
     OString extraInfo = selection.copy(selection.indexOf("{"));
     std::stringstream aStream(extraInfo.getStr());
@@ -2660,10 +2660,10 @@ void SdTiledRenderingTest::testMoveShapeHandle()
 
     CPPUNIT_ASSERT(!aView1.m_ShapeSelection.isEmpty());
     {
-        int id, x, y;
+        sal_uInt32 id, x, y;
         lcl_extractHandleParameters(aView1.m_ShapeSelection, id, x ,y);
-        int oldX = x;
-        int oldY = y;
+        sal_uInt32 oldX = x;
+        sal_uInt32 oldY = y;
         uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
         {
             {"HandleNum", uno::makeAny(id)},
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b991f06b3c0a..54f4ecc7b9a9 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2860,7 +2860,7 @@ void SwTiledRenderingTest::testDropDownFormFieldButtonNoSelection()
     }
 }
 
-static void lcl_extractHandleParameters(const OString& selection, int& id, int& x, int& y)
+static void lcl_extractHandleParameters(const OString& selection, sal_Int32& id, sal_Int32& x, sal_Int32& y)
 {
     OString extraInfo = selection.copy(selection.indexOf("{"));
     std::stringstream aStream(extraInfo.getStr());
@@ -2892,10 +2892,10 @@ void SwTiledRenderingTest::testMoveShapeHandle()
 
     CPPUNIT_ASSERT(!m_ShapeSelection.isEmpty());
     {
-        int id, x, y;
+        sal_Int32 id, x, y;
         lcl_extractHandleParameters(m_ShapeSelection, id, x ,y);
-        int oldX = x;
-        int oldY = y;
+        sal_Int32 oldX = x;
+        sal_Int32 oldY = y;
         uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence(
         {
             {"HandleNum", uno::makeAny(id)},


More information about the Libreoffice-commits mailing list