diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-21 09:57:46 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-21 13:53:17 +0100 |
| commit | 585328a7136aaa4b98b9cac0355a2cd7e9078dec (patch) | |
| tree | 28fd94cd6ecaf484de8deec5cb404149666e1654 /starmath/qa | |
| parent | 10e73684468a811acae56dfeafc8ecb5876a7960 (diff) | |
ofz#4703 Direct-leak
Change-Id: I5f3385d87aa5a48a8df3b6774dd1166cec60ebf8
Reviewed-on: https://gerrit.libreoffice.org/46893
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'starmath/qa')
| -rw-r--r-- | starmath/qa/cppunit/test_node.cxx | 4 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_parse.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx index 0086dfe45fb3..2a35bdffbe4c 100644 --- a/starmath/qa/cppunit/test_node.cxx +++ b/starmath/qa/cppunit/test_node.cxx @@ -89,11 +89,11 @@ void NodeTest::testTdf52225() #define CHECK_GREEK_SYMBOL(text, code, bItalic) do { \ mxDocShell->SetText(text); \ const SmTableNode *pTree= mxDocShell->GetFormulaTree(); \ - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTree->GetNumSubNodes()); \ + CPPUNIT_ASSERT_EQUAL(size_t(1), pTree->GetNumSubNodes()); \ const SmNode *pLine = pTree->GetSubNode(0); \ CPPUNIT_ASSERT(pLine); \ CPPUNIT_ASSERT_EQUAL(SmNodeType::Line, pLine->GetType()); \ - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pLine->GetNumSubNodes()); \ + CPPUNIT_ASSERT_EQUAL(size_t(1), pLine->GetNumSubNodes()); \ const SmNode *pNode = pLine->GetSubNode(0); \ CPPUNIT_ASSERT(pNode); \ CPPUNIT_ASSERT_EQUAL(SmNodeType::Special, pNode->GetType()); \ diff --git a/starmath/qa/cppunit/test_parse.cxx b/starmath/qa/cppunit/test_parse.cxx index cd014ab3ad72..c99a80568839 100644 --- a/starmath/qa/cppunit/test_parse.cxx +++ b/starmath/qa/cppunit/test_parse.cxx @@ -66,15 +66,15 @@ void ParseTest::tearDown() void ParseTest::testMinus() { std::unique_ptr<SmTableNode> pNode(SmParser().Parse("-1.2")); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pNode->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(1), pNode->GetNumSubNodes()); const SmNode *pNode0 = pNode->GetSubNode(0); CPPUNIT_ASSERT(pNode0); CPPUNIT_ASSERT_EQUAL(SmNodeType::Line, pNode0->GetType()); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pNode0->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(1), pNode0->GetNumSubNodes()); const SmNode *pNode00 = pNode0->GetSubNode(0); CPPUNIT_ASSERT(pNode00); CPPUNIT_ASSERT_EQUAL(SmNodeType::UnHor, pNode00->GetType()); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pNode00->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(2), pNode00->GetNumSubNodes()); const SmNode *pNode000 = pNode00->GetSubNode(0); CPPUNIT_ASSERT(pNode000); CPPUNIT_ASSERT_EQUAL(SmNodeType::Math, pNode000->GetType()); @@ -99,16 +99,16 @@ void ParseTest::testMinus() void ParseTest::testNospace() { std::unique_ptr<SmTableNode> pNode(SmParser().Parse("nospace{ nitalic d {F(x) G(x)} }")); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pNode->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(1), pNode->GetNumSubNodes()); const SmNode *pNode0 = pNode->GetSubNode(0); CPPUNIT_ASSERT(pNode0); CPPUNIT_ASSERT_EQUAL(SmNodeType::Line, pNode0->GetType()); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pNode0->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(1), pNode0->GetNumSubNodes()); const SmNode *pNode00 = pNode0->GetSubNode(0); CPPUNIT_ASSERT(pNode00); CPPUNIT_ASSERT_EQUAL(SmNodeType::Expression, pNode00->GetType()); CPPUNIT_ASSERT(!static_cast<const SmExpressionNode *>(pNode00)->IsUseExtraSpaces()); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pNode00->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(2), pNode00->GetNumSubNodes()); const SmNode *pNode000 = pNode00->GetSubNode(0); CPPUNIT_ASSERT(pNode000); CPPUNIT_ASSERT_EQUAL(SmNodeType::Font, pNode000->GetType()); @@ -118,7 +118,7 @@ void ParseTest::testNospace() CPPUNIT_ASSERT(pNode001); CPPUNIT_ASSERT_EQUAL(SmNodeType::Expression, pNode001->GetType()); CPPUNIT_ASSERT(static_cast<const SmExpressionNode *>(pNode001)->IsUseExtraSpaces()); - CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pNode00->GetNumSubNodes()); + CPPUNIT_ASSERT_EQUAL(size_t(2), pNode00->GetNumSubNodes()); } CPPUNIT_TEST_SUITE_REGISTRATION(ParseTest); |