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/inc/node.hxx | |
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/inc/node.hxx')
-rw-r--r-- | starmath/inc/node.hxx | 73 |
1 files changed, 1 insertions, 72 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index bd92aa86b41a..61a8c4225850 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -98,7 +98,7 @@ enum SmNodeType /*10*/ NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT, /*15*/ NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR, /*20*/ NLINE, NEXPRESSION, NPOLYLINE, NROOT, NROOTSYMBOL, -/*25*/ NRECTANGLE, NVERTICAL_BRACE, NMATHIDENT, NDYNINT, NDYNINTSYMBOL +/*25*/ NRECTANGLE, NVERTICAL_BRACE, NMATHIDENT }; @@ -545,29 +545,6 @@ public: }; -/** Dynamic Integral symbol node - * - * Node for drawing dynamically sized integral symbols. - * - * TODO: It might be created a parent class SmDynamicSizedNode - (for both dynamic integrals, roots and other dynamic symbols) - - */ -class SmDynIntegralSymbolNode : public SmMathSymbolNode -{ - - -public: - explicit SmDynIntegralSymbolNode(const SmToken &rNodeToken) - : SmMathSymbolNode(NDYNINTSYMBOL, rNodeToken) - {} - - virtual void AdaptToY(OutputDevice &rDev, sal_uLong nHeight) override; - - void Accept(SmVisitor* pVisitor) override; -}; - - /** Place node * * Used to create the <?> command, that denotes place where something can be @@ -740,33 +717,6 @@ public: }; -/** Dynamic Integral node - * - * Used to create Dynamically sized integrals - * - * Children:<BR> - * 0: Symbol (instance of DynIntegralSymbolNode)<BR> - * 1: Body<BR> - */ -class SmDynIntegralNode : public SmStructureNode -{ -public: - explicit SmDynIntegralNode(const SmToken &rNodeToken) - : SmStructureNode(NDYNINT, rNodeToken, 2) - { - } - - virtual void Arrange(OutputDevice &rDev, const SmFormat &rFormat) override; - void CreateTextFromNode(OUString &rText) override; - void Accept(SmVisitor* pVisitor) override; - - SmDynIntegralSymbolNode* Symbol(); - const SmDynIntegralSymbolNode* Symbol() const; - SmNode* Body(); - const SmNode* Body() const; -}; - - /** Binary horizontal node * * This node is used for binary operators. In a formula such as "A + B". @@ -1219,27 +1169,6 @@ inline const SmNode* SmRootNode::Body() const } -inline SmDynIntegralSymbolNode* SmDynIntegralNode::Symbol() -{ - assert( GetNumSubNodes() == 2 ); - assert( GetSubNode( 0 )->GetType() == NDYNINTSYMBOL ); - return static_cast< SmDynIntegralSymbolNode* >( GetSubNode( 0 )); -} -inline const SmDynIntegralSymbolNode* SmDynIntegralNode::Symbol() const -{ - return const_cast< SmDynIntegralNode* >( this )->Symbol(); -} -inline SmNode* SmDynIntegralNode::Body() -{ - assert( GetNumSubNodes() == 2 ); - return GetSubNode( 1 ); -} -inline const SmNode* SmDynIntegralNode::Body() const -{ - return const_cast< SmDynIntegralNode* >( this )->Body(); -} - - inline SmNode* SmBinHorNode::Symbol() { assert( GetNumSubNodes() == 3 ); |