diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-20 16:21:34 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-21 13:29:29 +0200 |
commit | 89633c6da1cde46983926dcc2e0f8e08de0e9378 (patch) | |
tree | 243f049b51b9f404e8697781dfada6c20ff0fee1 /winaccessibility | |
parent | 2a46a01902bccd1f025cce92ce6d32efbabf6825 (diff) |
remove unnecessary use of OUString::createFromAscii
Convert code like this:
OUString aStrSpacing(OUString::createFromAscii("spacing"));
to:
OUString aStrSpacing("spacing");
Change-Id: Ia2b7d6b42f35d33cfe587a0d6668030f3537fa6d
Diffstat (limited to 'winaccessibility')
-rw-r--r-- | winaccessibility/source/UAccCOM/AccTextBase.cxx | 22 | ||||
-rw-r--r-- | winaccessibility/source/UAccCOM/MAccessible.cxx | 10 | ||||
-rw-r--r-- | winaccessibility/source/service/AccObject.cxx | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx index 86968e36f003..e63afe468a31 100644 --- a/winaccessibility/source/UAccCOM/AccTextBase.cxx +++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx @@ -127,7 +127,7 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long { ::com::sun::star::beans::PropertyValue &pValue = pValues[i]; - if(pValue.Name.compareTo(OUString::createFromAscii("NumberingLevel"))==0) + if(pValue.Name == "NumberingLevel") { if (pValue.Value != Any()) pValue.Value >>= numberingLevel; @@ -136,13 +136,13 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long bHaveNumberingLevel = true; continue; } - if(pValue.Name.compareTo(OUString::createFromAscii("NumberingPrefix"))==0) + if(pValue.Name == "NumberingPrefix") { pValue.Value >>=numberingPrefix; bHaveNumberingPrefixAttr = true; continue; } - if(pValue.Name.compareTo(OUString::createFromAscii("NumberingRules"))==0) + if(pValue.Name == "NumberingRules") { bHaveNumberingRules = true; anyNumRule = pValue.Value; @@ -168,9 +168,9 @@ STDMETHODIMP CAccTextBase::get_attributes(long offset, long * startOffset, long OLECHAR pTemp[2048] = {0}; - if (pValue.Name.compareTo(OUString::createFromAscii("CharBackColor"))==0 || - pValue.Name.compareTo(OUString::createFromAscii("CharColor"))==0 || - pValue.Name.compareTo(OUString::createFromAscii("CharUnderlineColor"))==0 ) + if (pValue.Name == "CharBackColor" || + pValue.Name == "CharColor" || + pValue.Name == "CharUnderlineColor" ) { unsigned long nColor; pValue.Value >>= nColor; @@ -979,11 +979,11 @@ OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString re } OUString ReplaceFourChar(OUString oldOUString) { - oldOUString = ReplaceOneChar(oldOUString,OUString::createFromAscii("\\"),OUString::createFromAscii("\\\\")); - oldOUString = ReplaceOneChar(oldOUString,OUString::createFromAscii(";"),OUString::createFromAscii("\\;")); - oldOUString = ReplaceOneChar(oldOUString,OUString::createFromAscii("="),OUString::createFromAscii("\\=")); - oldOUString = ReplaceOneChar(oldOUString,OUString::createFromAscii(","),OUString::createFromAscii("\\,")); - oldOUString = ReplaceOneChar(oldOUString,OUString::createFromAscii(":"),OUString::createFromAscii("\\:")); + oldOUString = ReplaceOneChar(oldOUString, OUString("\\"), OUString("\\\\")); + oldOUString = ReplaceOneChar(oldOUString, OUString(";"), OUString("\\;")); + oldOUString = ReplaceOneChar(oldOUString, OUString("="), OUString("\\=")); + oldOUString = ReplaceOneChar(oldOUString, OUString(","), OUString("\\,")); + oldOUString = ReplaceOneChar(oldOUString, OUString(":"), OUString("\\:")); return oldOUString; } diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index 8998ec94dce7..ce94896ebfd5 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -2834,15 +2834,15 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c for( sal_Int32 i=0; i<nCount; i++ ) { ::com::sun::star::beans::PropertyValue rProp = pPropArray[i]; - if( (rProp.Name.compareTo(OUString::createFromAscii("BulletChar"))==0)|| - (rProp.Name.compareTo(OUString::createFromAscii("GraphicURL"))==0)|| - (rProp.Name.compareTo(OUString::createFromAscii("NumberingType"))==0)) + if( (rProp.Name == "BulletChar" ) || + (rProp.Name == "GraphicURL" ) || + (rProp.Name == "NumberingType" )) { OLECHAR propStr[512] = {NULL}; swprintf(propStr,L"%s=",rProp.Name.getStr()); OLECHAR pTemp[256] = {NULL}; CMAccessible::get_OLECHARFromAny(rProp.Value,pTemp); - if(rProp.Name.compareTo(OUString::createFromAscii("GraphicURL"))==0) + if(rProp.Name == "GraphicURL") { OLECHAR* pOccur = wcschr(pTemp,':'); if(pOccur) @@ -2852,7 +2852,7 @@ void CMAccessible::get_OLECHAR4Numbering(const Any& pAny, short numberingLevel,c wcscat(pChar,propStr); wcscat(pChar,L","); - if(rProp.Name.compareTo(OUString::createFromAscii("NumberingType"))==0) + if(rProp.Name == "NumberingType") { if(numberingPrefix.getLength()!=0) { diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx index db7566086ffa..fcfae2a84002 100644 --- a/winaccessibility/source/service/AccObject.cxx +++ b/winaccessibility/source/service/AccObject.cxx @@ -277,7 +277,7 @@ void AccObject::UpdateName( ) //IAccessibility2 Implementation 2009----- if ( PARAGRAPH == m_accRole) { - ::rtl::OUString emptyStr = ::rtl::OUString::createFromAscii(""); + ::rtl::OUString emptyStr(""); m_pIMAcc->Put_XAccName(emptyStr.getStr()); } //-----IAccessibility2 Implementation 2009 |