diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 13:32:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-18 14:12:32 +0100 |
| commit | 0530bbb0756f7d0b224ab1802b07387c562f3b1b (patch) | |
| tree | 6207c4ae213cda1e39a0d1d28f2a5079e6245c26 | |
| parent | 7ff32983b0219fc39f6b78cdd4a42f08aff8dc6f (diff) | |
starmath: Use appropriate OUString functions on string constants
Change-Id: I474eef1f76e171c5a016dd0b1fe225dcaeeb0eda
| -rw-r--r-- | starmath/source/cfgitem.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/document.cxx | 8 | ||||
| -rw-r--r-- | starmath/source/mathmlimport.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index a94e40cb52ef..043c392346fc 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -214,7 +214,7 @@ SmCfgOther::SmCfgOther() SmFontFormat::SmFontFormat() { - aName = OUString( FONTNAME_MATH ); + aName = FONTNAME_MATH; nCharSet = RTL_TEXTENCODING_UNICODE; nFamily = FAMILY_DONTKNOW; nPitch = PITCH_DONTKNOW; diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 5bf4abb490ec..5f1948c0e17a 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -709,9 +709,9 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium) bool bSuccess = false; 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) { @@ -898,14 +898,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium ) ArrangeFormula(); const OUString& rFltName = pFlt->GetFilterName(); - if(rFltName.equals( STAROFFICE_XML )) + if(rFltName == STAROFFICE_XML) { Reference<com::sun::star::frame::XModel> xModel(GetModel()); SmXMLExportWrapper aEquation(xModel); aEquation.SetFlat(false); bRet = aEquation.Export(rMedium); } - else if(rFltName.equals( MATHML_XML )) + else if(rFltName == MATHML_XML) { Reference<com::sun::star::frame::XModel> xModel(GetModel()); SmXMLExportWrapper aEquation(xModel); diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index cfdf492e3fa7..95a89b4c4f8d 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -1675,7 +1675,7 @@ void SmXMLNoneContext_Impl::EndElement(void) { SmToken aToken; aToken.cMathChar = '\0'; - aToken.aText = ""; + aToken.aText.clear(); aToken.nLevel = 5; aToken.eType = TIDENT; GetSmImport().GetNodeStack().push_front( diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 711f206af813..521560209cc5 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -461,7 +461,7 @@ void SmParser::NextToken() m_aCurToken.cMathChar = '\0'; m_aCurToken.nGroup = 0; m_aCurToken.nLevel = 0; - m_aCurToken.aText = ""; + m_aCurToken.aText.clear(); } else if (aRes.TokenType & KParseType::ANY_NUMBER) { |