diff options
| -rw-r--r-- | starmath/inc/node.hxx | 22 | ||||
| -rw-r--r-- | starmath/source/node.cxx | 14 |
2 files changed, 18 insertions, 18 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index 5215e711998c..79c4e0ff33a4 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -227,12 +227,12 @@ private: */ class SmStructureNode : public SmNode { - SmNodeArray aSubNodes; + SmNodeArray maSubNodes; protected: SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken, size_t nSize = 0) : SmNode(eNodeType, rNodeToken) - , aSubNodes(nSize) + , maSubNodes(nSize) {} public: @@ -249,10 +249,10 @@ public: virtual void GetAccessibleText( OUStringBuffer &rText ) const override; - SmNodeArray::iterator begin() {return aSubNodes.begin();} - SmNodeArray::iterator end() {return aSubNodes.end();} - SmNodeArray::reverse_iterator rbegin() {return aSubNodes.rbegin();} - SmNodeArray::reverse_iterator rend() {return aSubNodes.rend();} + SmNodeArray::iterator begin() {return maSubNodes.begin();} + SmNodeArray::iterator end() {return maSubNodes.end();} + SmNodeArray::reverse_iterator rbegin() {return maSubNodes.rbegin();} + SmNodeArray::reverse_iterator rend() {return maSubNodes.rend();} /** Get the index of a child node * @@ -269,16 +269,16 @@ public: void SetSubNode(size_t nIndex, SmNode* pNode) { - size_t size = aSubNodes.size(); + size_t size = maSubNodes.size(); if (size <= nIndex) { //Resize subnodes array - aSubNodes.resize(nIndex + 1); + maSubNodes.resize(nIndex + 1); //Set new slots to NULL for (size_t i = size; i < nIndex+1; i++) - aSubNodes[i] = nullptr; + maSubNodes[i] = nullptr; } - aSubNodes[nIndex] = pNode; + maSubNodes[nIndex] = pNode; ClaimPaternity(); } @@ -803,7 +803,7 @@ public: }; -/** Enum used to index sub-/supscripts in the 'aSubNodes' array +/** Enum used to index sub-/supscripts in the 'maSubNodes' array * in 'SmSubSupNode' * * See graphic for positions at char: diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 0cbb60b3f206..a37236db4224 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -381,13 +381,13 @@ SmStructureNode::~SmStructureNode() void SmStructureNode::SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird) { size_t nSize = pThird ? 3 : (pSecond ? 2 : (pFirst ? 1 : 0)); - aSubNodes.resize( nSize ); + maSubNodes.resize( nSize ); if (pFirst) - aSubNodes[0] = pFirst; + maSubNodes[0] = pFirst; if (pSecond) - aSubNodes[1] = pSecond; + maSubNodes[1] = pSecond; if (pThird) - aSubNodes[2] = pThird; + maSubNodes[2] = pThird; ClaimPaternity(); } @@ -395,7 +395,7 @@ void SmStructureNode::SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThir void SmStructureNode::SetSubNodes(const SmNodeArray &rNodeArray) { - aSubNodes = rNodeArray; + maSubNodes = rNodeArray; ClaimPaternity(); } @@ -408,13 +408,13 @@ bool SmStructureNode::IsVisible() const sal_uInt16 SmStructureNode::GetNumSubNodes() const { - return sal::static_int_cast<sal_uInt16>(aSubNodes.size()); + return sal::static_int_cast<sal_uInt16>(maSubNodes.size()); } SmNode * SmStructureNode::GetSubNode(sal_uInt16 nIndex) { - return aSubNodes[nIndex]; + return maSubNodes[nIndex]; } |