diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-23 06:03:55 +0900 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-23 05:38:53 +0000 |
| commit | 5ca4acf877834c51d896268cf3dd390903b2248b (patch) | |
| tree | 057c139ca671f7541b2f4ad619971607246d5d3d /starmath | |
| parent | 0ca9a3523cb2ccf97d7d13fdf4616af0dbe173d9 (diff) | |
starmath: Prefix members of SmErrorDesc
Change-Id: I4910561e3671f546f2e36344016e2b50fd2a70eb
Reviewed-on: https://gerrit.libreoffice.org/18788
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/error.hxx | 6 | ||||
| -rw-r--r-- | starmath/qa/cppunit/test_starmath.cxx | 6 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 8 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx index 7794a4a9b14a..99a224585195 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 06208654cebc..2a19ac6d5fae 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 f11bbe1940f0..5fd8417942a8 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 a84ea4fd1746..574755ba7d84 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())); } } |