diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-09-25 19:56:52 +0900 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-09-29 20:13:26 +0000 |
| commit | 663e26f24f1fa1abadc37838983bebd7407d65f8 (patch) | |
| tree | 27217b4520199f2fb3eff00d3c02b223563cad44 /starmath/source/parse.cxx | |
| parent | 38d61128467aedc2935443be21c38168f5e00df6 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'starmath/source/parse.cxx')
| -rw-r--r-- | starmath/source/parse.cxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 1a441e0e9759..f04b177bff32 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -151,7 +151,7 @@ static const SmTokenTableEntry aTokenTable[] = { "infinity" , TINFINITY, MS_INFINITY, TG::Standalone, 5}, { "infty" , TINFINITY, MS_INFINITY, TG::Standalone, 5}, { "int", TINT, MS_INT, TG::Oper, 5}, - { "intd", TINTD, MS_INT, TG::UnOper, 5}, + { "intd", TINTD, MS_INT, TG::Oper, 5}, { "intersection", TINTERSECT, MS_INTERSECT, TG::Product, 0}, { "ital", TITALIC, '\0', TG::FontAttr, 5}, { "italic", TITALIC, '\0', TG::FontAttr, 5}, @@ -1600,6 +1600,7 @@ void SmParser::DoOper() case TPROD : case TCOPROD : case TINT : + case TINTD : case TIINT : case TIIINT : case TLINT : @@ -1659,10 +1660,6 @@ void SmParser::DoUnOper() { case TABS : case TSQRT : - /* Dynamic integrals are handled as unary operators so we can wrap - the symbol together with the body in a upper level node and make - proper graphic arrangements */ - case TINTD: NextToken(); break; @@ -1723,12 +1720,6 @@ void SmParser::DoUnOper() pOper = new SmRootSymbolNode(aNodeToken); pSNode->SetSubNodes(pExtra, pOper, pArg); } - else if(eType == TINTD) - { - pSNode.reset(new SmDynIntegralNode(aNodeToken)); - pOper = new SmDynIntegralSymbolNode(aNodeToken); - pSNode->SetSubNodes(pOper, pArg); - } else { pSNode.reset(new SmUnHorNode(aNodeToken)); |