sc/qa/unit/tiledrendering/tiledrendering.cxx | 16 ++++++++--------
sd/qa/unit/tiledrendering/tiledrendering.cxx | 8 ++++----
sw/qa/extras/tiledrendering/tiledrendering.cxx | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 947bbe2ae33724f445968f50acf186305fb361e3
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Fri Jun 18 06:14:09 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jun 19 09:23:04 2021 +0200
fix 32bit build of tiledrendering tests
Squash of commits
49849a09e2823ac6edb42693daf7eac5312f2eb9
d7b9b9e8e02aefd61669e07543fc370b0c58207f
Change-Id: I2f10b7bb37b05961f73fad9ee2e716ed8177d8ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117474
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 07ebef6086d9..aed61f58a6cf 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -460,13 +460,13 @@ struct EditCursorMessage final {
std::string aVal =
aTree.get_child("refpoint").get_value<std::string>();
uno::Sequence<OUString> aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
- CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
aVal = aTree.get_child("relrect").get_value<std::string>();
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aVal.c_str()));
- CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
m_aRelRect.setX(aSeq[0].toInt32());
m_aRelRect.setY(aSeq[1].toInt32());
m_aRelRect.setWidth(aSeq[2].toInt32());
@@ -512,7 +512,7 @@ struct TextSelectionMessage
std::string("0, 0") :
aStr.substr(nRefDelimStart + 2, aStr.length() - 2 -
nRefDelimStart);
uno::Sequence<OUString> aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRefPointString.c_str()));
- CPPUNIT_ASSERT_EQUAL(2, aSeq.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aSeq.getLength());
m_aRefPoint.setX(aSeq[0].toInt32());
m_aRefPoint.setY(aSeq[1].toInt32());
@@ -525,7 +525,7 @@ struct TextSelectionMessage
std::string aRectString = aRectListString.substr(nStart, nEnd -
nStart);
{
aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(aRectString.c_str()));
- CPPUNIT_ASSERT_EQUAL(4, aSeq.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
tools::Rectangle aRect;
aRect.setX(aSeq[0].toInt32());
aRect.setY(aSeq[1].toInt32());
@@ -818,7 +818,7 @@ void ScTiledRenderingTest::testViewLock()
CPPUNIT_ASSERT(!aView1.m_bViewLock);
}
-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());
@@ -847,10 +847,10 @@ void ScTiledRenderingTest::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/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)},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
