editeng/qa/unit/core-test.cxx | 2 +- sw/qa/core/uwriter.cxx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
New commits: commit 8414915f477b33ed81768d69864bab6a136607fa Author: Tor Lillqvist <[email protected]> Date: Tue Dec 2 07:59:10 2014 +0200 WaE: Unreferenced function definition [loplugin:unreffun] Change-Id: I0a09b968651a5b98fae47d59c6a5e9b81468ae95 diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index d2cfaed..45e0cf6 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1278,10 +1278,12 @@ namespace struct TestRing : public sw::Ring<TestRing> { TestRing() : sw::Ring<TestRing>() {}; +#if 0 void debug() { SAL_DEBUG("TestRing at: " << this << " prev: " << GetPrev() << " next: " << GetNext()); } +#endif }; } commit 9bdde8b420265c7e77f4b310fb4c1214b715aa72 Author: Tor Lillqvist <[email protected]> Date: Tue Dec 2 07:54:10 2014 +0200 Adapt to int/sal_Int32 mismatch on 32-bit build Change-Id: Ifef81d53bee4241be3c0dd6b7ddb2c1bbf419b5e 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 [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
