editeng/qa/unit/core-test.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f8452c55c7edef28a356775b61d18b92cfbb3402
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Dec 2 08:21:31 2014 +0200
Adapt to int/sal_Int32 mismatch on 32-bit build
Change-Id: I9c5cb458ea7595c1b623ce14ed58fd3d5b3d961e
(cherry picked from commit f1e7489d98a1d1fd9e261e4a7e83fff03e5daf63)
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 4674311..81d5ab7 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -591,7 +591,7 @@ void Test::testSectionAttributes()
// now delete & join the paragraphs - this is fdo#85496 scenario
aEngine.QuickDelete(ESelection(0,0,1,3));
- CPPUNIT_ASSERT_EQUAL(1, aEngine.GetParagraphCount());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1),
aEngine.GetParagraphCount());
boost::scoped_ptr<EditTextObject>
pEditText(aEngine.CreateTextObject());
CPPUNIT_ASSERT_MESSAGE("Failed to create text object.",
pEditText.get());
commit 0254d9ece49917d691c92d898de46ec40e2b8cd4
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Dec 2 07:54:10 2014 +0200
Adapt to int/sal_Int32 mismatch on 32-bit build
Change-Id: Ifef81d53bee4241be3c0dd6b7ddb2c1bbf419b5e
(cherry picked from commit 9bdde8b420265c7e77f4b310fb4c1214b715aa72)
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index ae4a946..4674311 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -578,7 +578,7 @@ void Test::testSectionAttributes()
{
aEngine.Clear();
aEngine.SetText("one\ntwo");
- CPPUNIT_ASSERT_EQUAL(2, aEngine.GetParagraphCount());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2),
aEngine.GetParagraphCount());
// embolden 2nd paragraph
pSet.reset(new SfxItemSet(aEngine.GetEmptyItemSet()));
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
