starmath/inc/error.hxx | 6 +++--- starmath/qa/cppunit/test_starmath.cxx | 6 +++--- starmath/source/parse.cxx | 8 ++++---- starmath/source/view.cxx | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit 5ca4acf877834c51d896268cf3dd390903b2248b Author: Takeshi Abe <[email protected]> Date: Wed Sep 23 06:03:55 2015 +0900 starmath: Prefix members of SmErrorDesc Change-Id: I4910561e3671f546f2e36344016e2b50fd2a70eb Reviewed-on: https://gerrit.libreoffice.org/18788 Tested-by: Jenkins <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx index 7794a4a..99a2245 100644 --- a/starmath/inc/error.hxx +++ b/starmath/inc/error.hxx @@ -41,9 +41,9 @@ enum SmParseError struct SmErrorDesc { - SmParseError Type; - SmNode *pNode; - OUString Text; + SmParseError m_eType; + SmNode *m_pNode; + OUString m_aText; }; #endif diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx index 0620865..2a19ac6 100644 --- a/starmath/qa/cppunit/test_starmath.cxx +++ b/starmath/qa/cppunit/test_starmath.cxx @@ -149,17 +149,17 @@ void Test::editFailure() const SmErrorDesc *pErrorDesc = m_xDocShRef->GetParser().NextError(); CPPUNIT_ASSERT_MESSAGE("Should be a PE_COLOR_EXPECTED", - pErrorDesc && pErrorDesc->Type == PE_COLOR_EXPECTED); + pErrorDesc && pErrorDesc->m_eType == PE_COLOR_EXPECTED); pErrorDesc = m_xDocShRef->GetParser().PrevError(); CPPUNIT_ASSERT_MESSAGE("Should be a PE_UNEXPECTED_CHAR", - pErrorDesc && pErrorDesc->Type == PE_UNEXPECTED_CHAR); + pErrorDesc && pErrorDesc->m_eType == PE_UNEXPECTED_CHAR); pErrorDesc = m_xDocShRef->GetParser().PrevError(); CPPUNIT_ASSERT_MESSAGE("Should be a PE_RGROUP_EXPECTED", - pErrorDesc && pErrorDesc->Type == PE_RGROUP_EXPECTED); + pErrorDesc && pErrorDesc->m_eType == PE_RGROUP_EXPECTED); const SmErrorDesc *pLastErrorDesc = m_xDocShRef->GetParser().PrevError(); diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index f11bbe1..5fd8417 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -2414,9 +2414,9 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode) { SmErrorDesc *pErrDesc = new SmErrorDesc; - pErrDesc->Type = Type; - pErrDesc->pNode = pNode; - pErrDesc->Text = SM_RESSTR(RID_ERR_IDENT); + pErrDesc->m_eType = Type; + pErrDesc->m_pNode = pNode; + pErrDesc->m_aText = SM_RESSTR(RID_ERR_IDENT); sal_uInt16 nRID; switch (Type) @@ -2438,7 +2438,7 @@ size_t SmParser::AddError(SmParseError Type, SmNode *pNode) default: nRID = RID_ERR_UNKNOWN; } - pErrDesc->Text += SM_RESSTR(nRID); + pErrDesc->m_aText += SM_RESSTR(nRID); m_aErrDescList.push_back( pErrDesc ); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index a84ea4f..574755b 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1349,9 +1349,9 @@ void SmViewShell::ShowError(const SmErrorDesc* pErrorDesc) SAL_WARN_IF( !GetDoc(), "starmath", "Document missing" ); if (pErrorDesc || 0 != (pErrorDesc = GetDoc()->GetParser().GetError(0)) ) { - SetStatusText( pErrorDesc->Text ); - GetEditWindow()->MarkError( Point( pErrorDesc->pNode->GetColumn(), - pErrorDesc->pNode->GetRow())); + SetStatusText( pErrorDesc->m_aText ); + GetEditWindow()->MarkError( Point( pErrorDesc->m_pNode->GetColumn(), + pErrorDesc->m_pNode->GetRow())); } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
