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

starmath: Prefix members of SmParser

Browse Source 
Change-Id: Ib39bf2a9b8c37d9f2ac4ed3db602c3b0a82a506b
Reviewed-on: https://gerrit.libreoffice.org/29397
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
This commit is contained in:
Takeshi Abe 2016-09-30 15:00:40 +09:00
parent d88ba9042c
commit 4514d7032b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
starmath/inc/parse.hxx
View File

@ -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; }

16
starmath/source/parse.cxx
View File

@ -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;