Kaydet (Commit) fc0d4e6b authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Julien Nabet

starmath: Prefix member of SmCloningVisitor

Change-Id: I21511074a4dd2d0bf410401dfce7c43437824979
Reviewed-on: https://gerrit.libreoffice.org/32526Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
Tested-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 63133848
...@@ -334,7 +334,9 @@ private: ...@@ -334,7 +334,9 @@ private:
class SmCloningVisitor : public SmVisitor class SmCloningVisitor : public SmVisitor
{ {
public: public:
SmCloningVisitor( ){ pResult = nullptr; } SmCloningVisitor()
: mpResult(nullptr)
{}
virtual ~SmCloningVisitor() {} virtual ~SmCloningVisitor() {}
void Visit( SmTableNode* pNode ) override; void Visit( SmTableNode* pNode ) override;
void Visit( SmBraceNode* pNode ) override; void Visit( SmBraceNode* pNode ) override;
...@@ -366,7 +368,7 @@ public: ...@@ -366,7 +368,7 @@ public:
/** Clone a pNode */ /** Clone a pNode */
SmNode* Clone( SmNode* pNode ); SmNode* Clone( SmNode* pNode );
private: private:
SmNode* pResult; SmNode* mpResult;
/** Clone children of pSource and give them to pTarget */ /** Clone children of pSource and give them to pTarget */
void CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget ); void CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget );
/** Clone attributes on a pNode */ /** Clone attributes on a pNode */
......
...@@ -1593,10 +1593,10 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmPolyLineNode* ) ...@@ -1593,10 +1593,10 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmPolyLineNode* )
SmNode* SmCloningVisitor::Clone( SmNode* pNode ) SmNode* SmCloningVisitor::Clone( SmNode* pNode )
{ {
SmNode* pCurrResult = pResult; SmNode* pCurrResult = mpResult;
pNode->Accept( this ); pNode->Accept( this );
SmNode* pClone = pResult; SmNode* pClone = mpResult;
pResult = pCurrResult; mpResult = pCurrResult;
return pClone; return pClone;
} }
...@@ -1610,7 +1610,7 @@ void SmCloningVisitor::CloneNodeAttr( SmNode* pSource, SmNode* pTarget ) ...@@ -1610,7 +1610,7 @@ void SmCloningVisitor::CloneNodeAttr( SmNode* pSource, SmNode* pTarget )
void SmCloningVisitor::CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget ) void SmCloningVisitor::CloneKids( SmStructureNode* pSource, SmStructureNode* pTarget )
{ {
//Cache current result //Cache current result
SmNode* pCurrResult = pResult; SmNode* pCurrResult = mpResult;
//Create array for holding clones //Create array for holding clones
sal_uInt16 nSize = pSource->GetNumSubNodes( ); sal_uInt16 nSize = pSource->GetNumSubNodes( );
...@@ -1622,15 +1622,15 @@ void SmCloningVisitor::CloneKids( SmStructureNode* pSource, SmStructureNode* pTa ...@@ -1622,15 +1622,15 @@ void SmCloningVisitor::CloneKids( SmStructureNode* pSource, SmStructureNode* pTa
if( nullptr != ( pKid = pSource->GetSubNode( i ) ) ) if( nullptr != ( pKid = pSource->GetSubNode( i ) ) )
pKid->Accept( this ); pKid->Accept( this );
else else
pResult = nullptr; mpResult = nullptr;
aNodes[i] = pResult; aNodes[i] = mpResult;
} }
//Set subnodes of pTarget //Set subnodes of pTarget
pTarget->SetSubNodes( aNodes ); pTarget->SetSubNodes( aNodes );
//Restore result as where prior to call //Restore result as where prior to call
pResult = pCurrResult; mpResult = pCurrResult;
} }
void SmCloningVisitor::Visit( SmTableNode* pNode ) void SmCloningVisitor::Visit( SmTableNode* pNode )
...@@ -1638,7 +1638,7 @@ void SmCloningVisitor::Visit( SmTableNode* pNode ) ...@@ -1638,7 +1638,7 @@ void SmCloningVisitor::Visit( SmTableNode* pNode )
SmTableNode* pClone = new SmTableNode( pNode->GetToken( ) ); SmTableNode* pClone = new SmTableNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmBraceNode* pNode ) void SmCloningVisitor::Visit( SmBraceNode* pNode )
...@@ -1646,7 +1646,7 @@ void SmCloningVisitor::Visit( SmBraceNode* pNode ) ...@@ -1646,7 +1646,7 @@ void SmCloningVisitor::Visit( SmBraceNode* pNode )
SmBraceNode* pClone = new SmBraceNode( pNode->GetToken( ) ); SmBraceNode* pClone = new SmBraceNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmBracebodyNode* pNode ) void SmCloningVisitor::Visit( SmBracebodyNode* pNode )
...@@ -1654,7 +1654,7 @@ void SmCloningVisitor::Visit( SmBracebodyNode* pNode ) ...@@ -1654,7 +1654,7 @@ void SmCloningVisitor::Visit( SmBracebodyNode* pNode )
SmBracebodyNode* pClone = new SmBracebodyNode( pNode->GetToken( ) ); SmBracebodyNode* pClone = new SmBracebodyNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmOperNode* pNode ) void SmCloningVisitor::Visit( SmOperNode* pNode )
...@@ -1662,7 +1662,7 @@ void SmCloningVisitor::Visit( SmOperNode* pNode ) ...@@ -1662,7 +1662,7 @@ void SmCloningVisitor::Visit( SmOperNode* pNode )
SmOperNode* pClone = new SmOperNode( pNode->GetToken( ) ); SmOperNode* pClone = new SmOperNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmAlignNode* pNode ) void SmCloningVisitor::Visit( SmAlignNode* pNode )
...@@ -1670,7 +1670,7 @@ void SmCloningVisitor::Visit( SmAlignNode* pNode ) ...@@ -1670,7 +1670,7 @@ void SmCloningVisitor::Visit( SmAlignNode* pNode )
SmAlignNode* pClone = new SmAlignNode( pNode->GetToken( ) ); SmAlignNode* pClone = new SmAlignNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmAttributNode* pNode ) void SmCloningVisitor::Visit( SmAttributNode* pNode )
...@@ -1678,7 +1678,7 @@ void SmCloningVisitor::Visit( SmAttributNode* pNode ) ...@@ -1678,7 +1678,7 @@ void SmCloningVisitor::Visit( SmAttributNode* pNode )
SmAttributNode* pClone = new SmAttributNode( pNode->GetToken( ) ); SmAttributNode* pClone = new SmAttributNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmFontNode* pNode ) void SmCloningVisitor::Visit( SmFontNode* pNode )
...@@ -1687,7 +1687,7 @@ void SmCloningVisitor::Visit( SmFontNode* pNode ) ...@@ -1687,7 +1687,7 @@ void SmCloningVisitor::Visit( SmFontNode* pNode )
pClone->SetSizeParameter( pNode->GetSizeParameter( ), pNode->GetSizeType( ) ); pClone->SetSizeParameter( pNode->GetSizeParameter( ), pNode->GetSizeType( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmUnHorNode* pNode ) void SmCloningVisitor::Visit( SmUnHorNode* pNode )
...@@ -1695,7 +1695,7 @@ void SmCloningVisitor::Visit( SmUnHorNode* pNode ) ...@@ -1695,7 +1695,7 @@ void SmCloningVisitor::Visit( SmUnHorNode* pNode )
SmUnHorNode* pClone = new SmUnHorNode( pNode->GetToken( ) ); SmUnHorNode* pClone = new SmUnHorNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmBinHorNode* pNode ) void SmCloningVisitor::Visit( SmBinHorNode* pNode )
...@@ -1703,7 +1703,7 @@ void SmCloningVisitor::Visit( SmBinHorNode* pNode ) ...@@ -1703,7 +1703,7 @@ void SmCloningVisitor::Visit( SmBinHorNode* pNode )
SmBinHorNode* pClone = new SmBinHorNode( pNode->GetToken( ) ); SmBinHorNode* pClone = new SmBinHorNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmBinVerNode* pNode ) void SmCloningVisitor::Visit( SmBinVerNode* pNode )
...@@ -1711,7 +1711,7 @@ void SmCloningVisitor::Visit( SmBinVerNode* pNode ) ...@@ -1711,7 +1711,7 @@ void SmCloningVisitor::Visit( SmBinVerNode* pNode )
SmBinVerNode* pClone = new SmBinVerNode( pNode->GetToken( ) ); SmBinVerNode* pClone = new SmBinVerNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmBinDiagonalNode* pNode ) void SmCloningVisitor::Visit( SmBinDiagonalNode* pNode )
...@@ -1720,7 +1720,7 @@ void SmCloningVisitor::Visit( SmBinDiagonalNode* pNode ) ...@@ -1720,7 +1720,7 @@ void SmCloningVisitor::Visit( SmBinDiagonalNode* pNode )
pClone->SetAscending( pNode->IsAscending( ) ); pClone->SetAscending( pNode->IsAscending( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmSubSupNode* pNode ) void SmCloningVisitor::Visit( SmSubSupNode* pNode )
...@@ -1729,7 +1729,7 @@ void SmCloningVisitor::Visit( SmSubSupNode* pNode ) ...@@ -1729,7 +1729,7 @@ void SmCloningVisitor::Visit( SmSubSupNode* pNode )
pClone->SetUseLimits( pNode->IsUseLimits( ) ); pClone->SetUseLimits( pNode->IsUseLimits( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmMatrixNode* pNode ) void SmCloningVisitor::Visit( SmMatrixNode* pNode )
...@@ -1738,13 +1738,13 @@ void SmCloningVisitor::Visit( SmMatrixNode* pNode ) ...@@ -1738,13 +1738,13 @@ void SmCloningVisitor::Visit( SmMatrixNode* pNode )
pClone->SetRowCol( pNode->GetNumRows( ), pNode->GetNumCols( ) ); pClone->SetRowCol( pNode->GetNumRows( ), pNode->GetNumCols( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmPlaceNode* pNode ) void SmCloningVisitor::Visit( SmPlaceNode* pNode )
{ {
pResult = new SmPlaceNode( pNode->GetToken( ) ); mpResult = new SmPlaceNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmTextNode* pNode ) void SmCloningVisitor::Visit( SmTextNode* pNode )
...@@ -1752,39 +1752,39 @@ void SmCloningVisitor::Visit( SmTextNode* pNode ) ...@@ -1752,39 +1752,39 @@ void SmCloningVisitor::Visit( SmTextNode* pNode )
SmTextNode* pClone = new SmTextNode( pNode->GetToken( ), pNode->GetFontDesc( ) ); SmTextNode* pClone = new SmTextNode( pNode->GetToken( ), pNode->GetFontDesc( ) );
pClone->ChangeText( pNode->GetText( ) ); pClone->ChangeText( pNode->GetText( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmSpecialNode* pNode ) void SmCloningVisitor::Visit( SmSpecialNode* pNode )
{ {
pResult = new SmSpecialNode( pNode->GetToken( ) ); mpResult = new SmSpecialNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmGlyphSpecialNode* pNode ) void SmCloningVisitor::Visit( SmGlyphSpecialNode* pNode )
{ {
pResult = new SmGlyphSpecialNode( pNode->GetToken( ) ); mpResult = new SmGlyphSpecialNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmMathSymbolNode* pNode ) void SmCloningVisitor::Visit( SmMathSymbolNode* pNode )
{ {
pResult = new SmMathSymbolNode( pNode->GetToken( ) ); mpResult = new SmMathSymbolNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmBlankNode* pNode ) void SmCloningVisitor::Visit( SmBlankNode* pNode )
{ {
SmBlankNode* pClone = new SmBlankNode( pNode->GetToken( ) ); SmBlankNode* pClone = new SmBlankNode( pNode->GetToken( ) );
pClone->SetBlankNum( pNode->GetBlankNum( ) ); pClone->SetBlankNum( pNode->GetBlankNum( ) );
pResult = pClone; mpResult = pClone;
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmErrorNode* pNode ) void SmCloningVisitor::Visit( SmErrorNode* pNode )
{ {
pResult = new SmErrorNode( pNode->GetToken( ) ); mpResult = new SmErrorNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmLineNode* pNode ) void SmCloningVisitor::Visit( SmLineNode* pNode )
...@@ -1792,7 +1792,7 @@ void SmCloningVisitor::Visit( SmLineNode* pNode ) ...@@ -1792,7 +1792,7 @@ void SmCloningVisitor::Visit( SmLineNode* pNode )
SmLineNode* pClone = new SmLineNode( pNode->GetToken( ) ); SmLineNode* pClone = new SmLineNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmExpressionNode* pNode ) void SmCloningVisitor::Visit( SmExpressionNode* pNode )
...@@ -1800,13 +1800,13 @@ void SmCloningVisitor::Visit( SmExpressionNode* pNode ) ...@@ -1800,13 +1800,13 @@ void SmCloningVisitor::Visit( SmExpressionNode* pNode )
SmExpressionNode* pClone = new SmExpressionNode( pNode->GetToken( ) ); SmExpressionNode* pClone = new SmExpressionNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmPolyLineNode* pNode ) void SmCloningVisitor::Visit( SmPolyLineNode* pNode )
{ {
pResult = new SmPolyLineNode( pNode->GetToken( ) ); mpResult = new SmPolyLineNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmRootNode* pNode ) void SmCloningVisitor::Visit( SmRootNode* pNode )
...@@ -1814,19 +1814,19 @@ void SmCloningVisitor::Visit( SmRootNode* pNode ) ...@@ -1814,19 +1814,19 @@ void SmCloningVisitor::Visit( SmRootNode* pNode )
SmRootNode* pClone = new SmRootNode( pNode->GetToken( ) ); SmRootNode* pClone = new SmRootNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
void SmCloningVisitor::Visit( SmRootSymbolNode* pNode ) void SmCloningVisitor::Visit( SmRootSymbolNode* pNode )
{ {
pResult = new SmRootSymbolNode( pNode->GetToken( ) ); mpResult = new SmRootSymbolNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmRectangleNode* pNode ) void SmCloningVisitor::Visit( SmRectangleNode* pNode )
{ {
pResult = new SmRectangleNode( pNode->GetToken( ) ); mpResult = new SmRectangleNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pResult ); CloneNodeAttr( pNode, mpResult );
} }
void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode ) void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode )
...@@ -1834,7 +1834,7 @@ void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode ) ...@@ -1834,7 +1834,7 @@ void SmCloningVisitor::Visit( SmVerticalBraceNode* pNode )
SmVerticalBraceNode* pClone = new SmVerticalBraceNode( pNode->GetToken( ) ); SmVerticalBraceNode* pClone = new SmVerticalBraceNode( pNode->GetToken( ) );
CloneNodeAttr( pNode, pClone ); CloneNodeAttr( pNode, pClone );
CloneKids( pNode, pClone ); CloneKids( pNode, pClone );
pResult = pClone; mpResult = pClone;
} }
// SmSelectionDrawingVisitor // SmSelectionDrawingVisitor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment