Kaydet (Commit) 0530bbb0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

starmath: Use appropriate OUString functions on string constants

Change-Id: I474eef1f76e171c5a016dd0b1fe225dcaeeb0eda
üst 7ff32983
...@@ -214,7 +214,7 @@ SmCfgOther::SmCfgOther() ...@@ -214,7 +214,7 @@ SmCfgOther::SmCfgOther()
SmFontFormat::SmFontFormat() SmFontFormat::SmFontFormat()
{ {
aName = OUString( FONTNAME_MATH ); aName = FONTNAME_MATH;
nCharSet = RTL_TEXTENCODING_UNICODE; nCharSet = RTL_TEXTENCODING_UNICODE;
nFamily = FAMILY_DONTKNOW; nFamily = FAMILY_DONTKNOW;
nPitch = PITCH_DONTKNOW; nPitch = PITCH_DONTKNOW;
......
...@@ -709,9 +709,9 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium) ...@@ -709,9 +709,9 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
bool bSuccess = false; bool bSuccess = false;
const OUString& rFltName = rMedium.GetFilter()->GetFilterName(); const OUString& rFltName = rMedium.GetFilter()->GetFilterName();
OSL_ENSURE( !rFltName.equals( STAROFFICE_XML ), "Wrong filter!"); OSL_ENSURE( rFltName != STAROFFICE_XML, "Wrong filter!");
if ( rFltName.equals( MATHML_XML ) ) if ( rFltName == MATHML_XML )
{ {
if (pTree) if (pTree)
{ {
...@@ -898,14 +898,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium ) ...@@ -898,14 +898,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
ArrangeFormula(); ArrangeFormula();
const OUString& rFltName = pFlt->GetFilterName(); const OUString& rFltName = pFlt->GetFilterName();
if(rFltName.equals( STAROFFICE_XML )) if(rFltName == STAROFFICE_XML)
{ {
Reference<com::sun::star::frame::XModel> xModel(GetModel()); Reference<com::sun::star::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
aEquation.SetFlat(false); aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium); bRet = aEquation.Export(rMedium);
} }
else if(rFltName.equals( MATHML_XML )) else if(rFltName == MATHML_XML)
{ {
Reference<com::sun::star::frame::XModel> xModel(GetModel()); Reference<com::sun::star::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel); SmXMLExportWrapper aEquation(xModel);
......
...@@ -1675,7 +1675,7 @@ void SmXMLNoneContext_Impl::EndElement(void) ...@@ -1675,7 +1675,7 @@ void SmXMLNoneContext_Impl::EndElement(void)
{ {
SmToken aToken; SmToken aToken;
aToken.cMathChar = '\0'; aToken.cMathChar = '\0';
aToken.aText = ""; aToken.aText.clear();
aToken.nLevel = 5; aToken.nLevel = 5;
aToken.eType = TIDENT; aToken.eType = TIDENT;
GetSmImport().GetNodeStack().push_front( GetSmImport().GetNodeStack().push_front(
......
...@@ -461,7 +461,7 @@ void SmParser::NextToken() ...@@ -461,7 +461,7 @@ void SmParser::NextToken()
m_aCurToken.cMathChar = '\0'; m_aCurToken.cMathChar = '\0';
m_aCurToken.nGroup = 0; m_aCurToken.nGroup = 0;
m_aCurToken.nLevel = 0; m_aCurToken.nLevel = 0;
m_aCurToken.aText = ""; m_aCurToken.aText.clear();
} }
else if (aRes.TokenType & KParseType::ANY_NUMBER) else if (aRes.TokenType & KParseType::ANY_NUMBER)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment