[Libreoffice-commits] core.git: starmath/inc starmath/source

[Takeshi Abe]

 starmath/inc/node.hxx    |   13 +++++++------
 starmath/source/node.cxx |   33 +++++++++++++++++----------------
 2 files changed, 24 insertions(+), 22 deletions(-)

New commits:
commit 803ad61c80220ab28c3fb14cfae0985f30b8b868
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Nov 21 16:20:18 2016 +0900

    starmath: Prefix members of SmNodeMatrix
    
    Change-Id: I76c7e34878b9d2bc74d2499cf65448f0dd3a17b3
    Reviewed-on: https://gerrit.libreoffice.org/31034
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index c0e5de4e..29c9ccb 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -1091,18 +1091,19 @@ public:
  */
 class SmMatrixNode : public SmStructureNode
 {
-    sal_uInt16  nNumRows,
-            nNumCols;
+    sal_uInt16 mnNumRows,
+               mnNumCols;
 
 public:
     explicit SmMatrixNode(const SmToken &rNodeToken)
-    :   SmStructureNode(NMATRIX, rNodeToken)
+        : SmStructureNode(NMATRIX, rNodeToken)
+        , mnNumRows(0)
+        , mnNumCols(0)
     {
-        nNumRows = nNumCols = 0;
     }
 
-    sal_uInt16 GetNumRows() const {return nNumRows;}
-    sal_uInt16 GetNumCols() const {return nNumCols;}
+    sal_uInt16 GetNumRows() const {return mnNumRows;}
+    sal_uInt16 GetNumCols() const {return mnNumCols;}
     void SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols);
 
     virtual const SmNode * GetLeftMost() const override;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 6b7adb4..f650108 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2212,17 +2212,17 @@ sal_Unicode SmTextNode::ConvertSymbolToUnicode(sal_Unicode nIn)
 void SmMatrixNode::CreateTextFromNode(OUString &rText)
 {
     rText += "matrix {";
-    for (sal_uInt16 i = 0;  i < nNumRows; i++)
+    for (sal_uInt16 i = 0;  i < mnNumRows; i++)
     {
-        for (sal_uInt16 j = 0;  j < nNumCols; j++)
+        for (sal_uInt16 j = 0;  j < mnNumCols; j++)
         {
-            SmNode *pNode = GetSubNode(i * nNumCols + j);
+            SmNode *pNode = GetSubNode(i * mnNumCols + j);
             if (pNode)
                 pNode->CreateTextFromNode(rText);
-            if (j != nNumCols-1)
+            if (j != mnNumCols-1)
                 rText += "# ";
         }
-        if (i != nNumRows-1)
+        if (i != mnNumRows-1)
             rText += "## ";
     }
     rText = comphelper::string::stripEnd(rText, ' ');
@@ -2237,7 +2237,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
 
     // initialize array that is to hold the maximum widths of all
     // elements (subnodes) in that column.
-    std::vector<long> aColWidth(nNumCols);
+    std::vector<long> aColWidth(mnNumCols);
 
     // arrange subnodes and calculate the above arrays contents
     sal_uInt16 nNodes = GetNumSubNodes();
@@ -2247,7 +2247,7 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
         if (nullptr != (pNode = GetSubNode(nIdx)))
         {
             pNode->Arrange(rDev, rFormat);
-            int  nCol = nIdx % nNumCols;
+            int  nCol = nIdx % mnNumCols;
             aColWidth[nCol] = std::max(aColWidth[nCol], pNode->GetItalicWidth());
         }
     }
@@ -2261,21 +2261,22 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
           nVerDist = nNormDist * rFormat.GetDistance(DIS_MATRIXROW) / 100L;
 
     // build array that holds the leftmost position for each column
-    std::vector<long> aColLeft(nNumCols);
+    std::vector<long> aColLeft(mnNumCols);
     long  nX = 0;
-    for (j = 0;  j < nNumCols;  j++)
+    for (j = 0;  j < mnNumCols;  j++)
     {
         aColLeft[j] = nX;
         nX += aColWidth[j] + nHorDist;
     }
 
     SmRect::operator = (SmRect());
-    for (i = 0;  i < nNumRows;  i++)
+    for (i = 0;  i < mnNumRows;  i++)
     {
         Point aPos;
         SmRect aLineRect;
-        for (j = 0;  j < nNumCols;  j++)
-        {   SmNode *pTmpNode = GetSubNode(i * nNumCols + j);
+        for (j = 0;  j < mnNumCols;  j++)
+        {
+            SmNode *pTmpNode = GetSubNode(i * mnNumCols + j);
             assert(pTmpNode);
 
             const SmRect &rNodeRect = pTmpNode->GetRect();
@@ -2318,8 +2319,8 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
         Point aDelta(0, // since horizontal alignment is already done
                      aPos.Y() - aLineRect.GetTop());
         aLineRect.Move(aDelta);
-        for (j = 0;  j < nNumCols;  j++)
-            if (nullptr != (pNode = GetSubNode(i * nNumCols + j)))
+        for (j = 0;  j < mnNumCols;  j++)
+            if (nullptr != (pNode = GetSubNode(i * mnNumCols + j)))
                 pNode->Move(aDelta);
 
         ExtendBy(aLineRect, RectCopyMBL::None);
@@ -2329,8 +2330,8 @@ void SmMatrixNode::Arrange(OutputDevice &rDev, const SmFormat &rFormat)
 
 void SmMatrixNode::SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols)
 {
-    nNumRows = nMatrixRows;
-    nNumCols = nMatrixCols;
+    mnNumRows = nMatrixRows;
+    mnNumCols = nMatrixCols;
 }