From 663e26f24f1fa1abadc37838983bebd7407d65f8 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sun, 25 Sep 2016 19:56:52 +0900 Subject: tdf#53472, tdf#102268: Reimplement "intd" This reverts its original implementation introduced with 93e6291c29d547c0c29c6e43b2ca4b36a3e8506f partially, and improves the patch proposed at 746633bd0315939fd5e0b50c90692d356d2ed678 (but reverted at e265ea36df02310881e959a031b74578b323bfa5). Change-Id: If0aa5b985cac45a1cd9ea87bae293243af9d12b2 Reviewed-on: https://gerrit.libreoffice.org/29271 Tested-by: Jenkins Reviewed-by: Khaled Hosny --- starmath/qa/cppunit/mock-visitor.hxx | 11 ----------- starmath/qa/cppunit/test_nodetotextvisitors.cxx | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'starmath/qa') diff --git a/starmath/qa/cppunit/mock-visitor.hxx b/starmath/qa/cppunit/mock-visitor.hxx index 2c7f6bf77efc..b3ed74803cbe 100644 --- a/starmath/qa/cppunit/mock-visitor.hxx +++ b/starmath/qa/cppunit/mock-visitor.hxx @@ -165,17 +165,6 @@ public: NROOTSYMBOL, pNode->GetType()); } - void Visit( SmDynIntegralNode* pNode ) override { - CPPUNIT_ASSERT_EQUAL_MESSAGE("SmDynIntegralNode should have type NDYNINT", - NDYNINT, pNode->GetType()); - VisitChildren( pNode ); - } - - void Visit( SmDynIntegralSymbolNode* pNode ) override { - CPPUNIT_ASSERT_EQUAL_MESSAGE("SmDynIntegralSymbolNode should have type NDYNINTSYMBOL", - NDYNINTSYMBOL, pNode->GetType()); - } - void Visit( SmRectangleNode* pNode ) override { CPPUNIT_ASSERT_EQUAL_MESSAGE("SmRectangleNode should have type NRECTANGLE", NRECTANGLE, pNode->GetType()); diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx index ffa3f599f932..8b1e2153cb94 100644 --- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx +++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx @@ -230,6 +230,7 @@ void Test::SimpleOperators() ParseAndCheck("int csup {r_0} csub {r_t} a", "int csup { r _ 0 } csub { r _ t } a ", "Upper and lower bounds shown with integral (csub & csup)"); //FIXME ParseAndCheck("sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "sum csup { size 8 { x - 1 } } csub { size 8 a } b ", "Sum with sized upper and lower bounds"); parseandparseagain("int{a}", "Integral"); + parseandparseagain("intd_{1}^{2}{x dx}", "Dynamically-sized integral"); parseandparseagain("iint{a}", "Double integral"); parseandparseagain("iiint{a}", "Triple integral"); parseandparseagain("sum from{3}b", "Lower bound shown with summation symbol"); -- cgit