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

[Takeshi Abe]

 starmath/inc/parse.hxx    |    8 ++++----
 starmath/source/parse.cxx |   16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 4514d7032b8a93d6bfacbb3354bafca98c0559b6
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Fri Sep 30 15:00:40 2016 +0900

    starmath: Prefix members of SmParser
    
    Change-Id: Ib39bf2a9b8c37d9f2ac4ed3db602c3b0a82a506b
    Reviewed-on: https://gerrit.libreoffice.org/29397
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Takeshi Abe <tabe at fixedpoint.jp>

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 2c8e9b2..b3669dd 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -38,9 +38,9 @@ class SmParser
     int             m_nCurError;
     sal_Int32       m_nBufferIndex,
                     m_nTokenIndex;
-    sal_Int32       m_Row,
+    sal_Int32       m_nRow,
                     m_nColOff;
-    bool            bImportSymNames,
+    bool            m_bImportSymNames,
                     m_bExportSymNames;
 
     // map of used symbols (used to reduce file size by exporting only actually used symbols)
@@ -105,8 +105,8 @@ public:
 
     const OUString & GetText() const { return m_aBufferString; };
 
-    bool        IsImportSymbolNames() const        { return bImportSymNames; }
-    void        SetImportSymbolNames(bool bVal)    { bImportSymNames = bVal; }
+    bool        IsImportSymbolNames() const        { return m_bImportSymNames; }
+    void        SetImportSymbolNames(bool bVal)    { m_bImportSymNames = bVal; }
     bool        IsExportSymbolNames() const        { return m_bExportSymNames; }
     void        SetExportSymbolNames(bool bVal)    { m_bExportSymNames = bVal; }
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index eeea617..63886e5 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -415,7 +415,7 @@ void SmParser::NextToken()
                 '\n' == m_aBufferString[ nRealStart ] )
         {
             // keep data needed for tokens row and col entry up to date
-            ++m_Row;
+            ++m_nRow;
             m_nBufferIndex = m_nColOff = nRealStart + 1;
             bCont = true;
         }
@@ -437,7 +437,7 @@ void SmParser::NextToken()
     // set index of current token
     m_nTokenIndex = m_nBufferIndex;
 
-    m_aCurToken.nRow   = m_Row;
+    m_aCurToken.nRow   = m_nRow;
     m_aCurToken.nCol   = nRealStart - m_nColOff + 1;
 
     bool bHandled = true;
@@ -476,7 +476,7 @@ void SmParser::NextToken()
         m_aCurToken.nGroup     = TG::NONE;
         m_aCurToken.nLevel     = 5;
         m_aCurToken.aText     = aRes.DequotedNameOrString;
-        m_aCurToken.nRow       = m_Row;
+        m_aCurToken.nRow       = m_nRow;
         m_aCurToken.nCol       = nRealStart - m_nColOff + 2;
     }
     else if (aRes.TokenType & KParseType::IDENTNAME)
@@ -656,7 +656,7 @@ void SmParser::NextToken()
                         m_aCurToken.nGroup     = TG::NONE;
                         m_aCurToken.nLevel     = 5;
                         m_aCurToken.aText      ="%";
-                        m_aCurToken.nRow       = m_Row;
+                        m_aCurToken.nRow       = m_nRow;
                         m_aCurToken.nCol       = nTmpStart - m_nColOff;
 
                         if (aTmpRes.TokenType & KParseType::IDENTNAME)
@@ -2299,9 +2299,9 @@ SmParser::SmParser()
     : m_nCurError( 0 )
     , m_nBufferIndex( 0 )
     , m_nTokenIndex( 0 )
-    , m_Row( 0 )
+    , m_nRow( 0 )
     , m_nColOff( 0 )
-    , bImportSymNames( false )
+    , m_bImportSymNames( false )
     , m_bExportSymNames( false )
     , m_aDotLoc( LanguageTag::convertToLocale( LANGUAGE_ENGLISH_US ) )
 {
@@ -2314,7 +2314,7 @@ SmTableNode *SmParser::Parse(const OUString &rBuffer)
     m_aBufferString = convertLineEnd(rBuffer, LINEEND_LF);
     m_nBufferIndex  = 0;
     m_nTokenIndex   = 0;
-    m_Row           = 1;
+    m_nRow          = 1;
     m_nColOff       = 0;
     m_nCurError     = -1;
 
@@ -2331,7 +2331,7 @@ SmNode *SmParser::ParseExpression(const OUString &rBuffer)
     m_aBufferString = convertLineEnd(rBuffer, LINEEND_LF);
     m_nBufferIndex  = 0;
     m_nTokenIndex   = 0;
-    m_Row           = 1;
+    m_nRow          = 1;
     m_nColOff       = 0;
     m_nCurError     = -1;