mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starmath: Prefix members of SmStructureNode

Browse Source 
Change-Id: I58f6ca7585ef726d4ac3f555118832a4434f4e3c
Reviewed-on: https://gerrit.libreoffice.org/31629
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
This commit is contained in:
Takeshi Abe
2016-12-05 20:41:27 +09:00
parent d78f29ab3f
commit 59a59de8be
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
starmath/inc/node.hxx
View File

@@ -227,12 +227,12 @@ private:
*/ */
class SmStructureNode : public SmNode class SmStructureNode : public SmNode
{ {
SmNodeArray aSubNodes; SmNodeArray maSubNodes;
protected: protected:
SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken, size_t nSize = 0) SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken, size_t nSize = 0)
: SmNode(eNodeType, rNodeToken) : SmNode(eNodeType, rNodeToken)
, aSubNodes(nSize) , maSubNodes(nSize)
{} {}
public: public:
@@ -249,10 +249,10 @@ public:
virtual void GetAccessibleText( OUStringBuffer &rText ) const override; virtual void GetAccessibleText( OUStringBuffer &rText ) const override;
SmNodeArray::iterator begin() {return aSubNodes.begin();} SmNodeArray::iterator begin() {return maSubNodes.begin();}
SmNodeArray::iterator end() {return aSubNodes.end();} SmNodeArray::iterator end() {return maSubNodes.end();}
SmNodeArray::reverse_iterator rbegin() {return aSubNodes.rbegin();} SmNodeArray::reverse_iterator rbegin() {return maSubNodes.rbegin();}
SmNodeArray::reverse_iterator rend() {return aSubNodes.rend();} SmNodeArray::reverse_iterator rend() {return maSubNodes.rend();}
/** Get the index of a child node /** Get the index of a child node
* *
@@ -269,16 +269,16 @@ public:
void SetSubNode(size_t nIndex, SmNode* pNode) void SetSubNode(size_t nIndex, SmNode* pNode)
{ {
size_t size = aSubNodes.size(); size_t size = maSubNodes.size();
if (size <= nIndex) if (size <= nIndex)
{ {
//Resize subnodes array //Resize subnodes array
aSubNodes.resize(nIndex + 1); maSubNodes.resize(nIndex + 1);
//Set new slots to NULL //Set new slots to NULL
for (size_t i = size; i < nIndex+1; i++) for (size_t i = size; i < nIndex+1; i++)
aSubNodes[i] = nullptr; maSubNodes[i] = nullptr;
} }
aSubNodes[nIndex] = pNode; maSubNodes[nIndex] = pNode;
ClaimPaternity(); 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' * in 'SmSubSupNode'
* *
* See graphic for positions at char: * See graphic for positions at char:

14
starmath/source/node.cxx
View File

@@ -381,13 +381,13 @@ SmStructureNode::~SmStructureNode()
void SmStructureNode::SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird) void SmStructureNode::SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird)
{ {
size_t nSize = pThird ? 3 : (pSecond ? 2 : (pFirst ? 1 : 0)); size_t nSize = pThird ? 3 : (pSecond ? 2 : (pFirst ? 1 : 0));
aSubNodes.resize( nSize ); maSubNodes.resize( nSize );
if (pFirst) if (pFirst)
aSubNodes[0] = pFirst; maSubNodes[0] = pFirst;
if (pSecond) if (pSecond)
aSubNodes[1] = pSecond; maSubNodes[1] = pSecond;
if (pThird) if (pThird)
aSubNodes[2] = pThird; maSubNodes[2] = pThird;
ClaimPaternity(); ClaimPaternity();
} }
@@ -395,7 +395,7 @@ void SmStructureNode::SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThir
void SmStructureNode::SetSubNodes(const SmNodeArray &rNodeArray) void SmStructureNode::SetSubNodes(const SmNodeArray &rNodeArray)
{ {
aSubNodes = rNodeArray; maSubNodes = rNodeArray;
ClaimPaternity(); ClaimPaternity();
} }
@@ -408,13 +408,13 @@ bool SmStructureNode::IsVisible() const
sal_uInt16 SmStructureNode::GetNumSubNodes() 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) SmNode * SmStructureNode::GetSubNode(sal_uInt16 nIndex)
{ {
return aSubNodes[nIndex]; return maSubNodes[nIndex];
} }