diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-08-31 17:02:17 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-09-01 14:06:36 +0200 |
| commit | a3b2fdcde2c577495b88941e56d4cd2aa82034dc (patch) | |
| tree | dd8bfdaa738d3af810eb85414f70c701e8ad0ab2 /starmath | |
| parent | cd0f9f31a2eb400e4b028eaddbf9b16d94ad5572 (diff) | |
revert accessors for SmUnHorNode, factorial has it the other way around
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/node.hxx | 24 | ||||
| -rw-r--r-- | starmath/source/ooxml.cxx | 4 |
2 files changed, 2 insertions, 26 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index e39046308345..07aca32eaa29 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -750,11 +750,6 @@ public: virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat); void Accept(SmVisitor* pVisitor); - - SmMathSymbolNode* Symbol(); - const SmMathSymbolNode* Symbol() const; - SmNode* Operand(); - const SmNode* Operand() const; }; @@ -1285,25 +1280,6 @@ inline const SmNode* SmRootNode::Body() const return const_cast< SmRootNode* >( this )->Body(); } -inline SmMathSymbolNode* SmUnHorNode::Symbol() -{ - OSL_ASSERT( GetNumSubNodes() > 0 && GetSubNode( 0 )->GetType() == NMATH ); - return static_cast< SmMathSymbolNode* >( GetSubNode( 0 )); -} -inline const SmMathSymbolNode* SmUnHorNode::Symbol() const -{ - return const_cast< SmUnHorNode* >( this )->Symbol(); -} -inline SmNode* SmUnHorNode::Operand() -{ - OSL_ASSERT( GetNumSubNodes() > 1 ); - return GetSubNode( 1 ); -} -inline const SmNode* SmUnHorNode::Operand() const -{ - return const_cast< SmUnHorNode* >( this )->Operand(); -} - inline SmMathSymbolNode* SmBinHorNode::Symbol() { OSL_ASSERT( GetNumSubNodes() > 1 && GetSubNode( 1 )->GetType() == NMATH ); diff --git a/starmath/source/ooxml.cxx b/starmath/source/ooxml.cxx index 7f06d71ba50c..56036fbb8331 100644 --- a/starmath/source/ooxml.cxx +++ b/starmath/source/ooxml.cxx @@ -328,8 +328,8 @@ void SmOoxml::HandleFractions( const SmNode* pNode, int nLevel, const char* type void SmOoxml::HandleUnaryOperation( const SmUnHorNode* pNode, int nLevel ) { // update HandleMath() when adding new items -// fprintf(stderr,"UNARY %d\n", pNode->Symbol()->GetToken().eType ); - switch( pNode->Symbol()->GetToken().eType ) + fprintf(stderr,"UNARY %d\n", pNode->GetToken().eType ); + switch( pNode->GetToken().eType ) { default: HandleAllSubNodes( pNode, nLevel ); |