diff options
Diffstat (limited to 'linguistic/source')
| -rw-r--r-- | linguistic/source/convdiclist.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/convdicxml.cxx | 16 | ||||
| -rw-r--r-- | linguistic/source/hhconvdic.cxx | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 05b3a9bc52fe..85ac0c866bfb 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -650,7 +650,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY_LIST)); + return rServiceName == SN_CONV_DICTIONARY_LIST; } diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index 4cda05e0df3f..485d3dc9f6d2 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -216,7 +216,7 @@ SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "text-conversion-dictionary" ) pContext = new ConvDicXMLDictionaryContext_Impl( GetConvDicImport(), nPrefix, rLocalName ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -236,9 +236,9 @@ void ConvDicXMLDictionaryContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lang"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "lang" ) nLanguage = MsLangId::convertIsoStringToLanguage( aValue ); - else if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("conversion-type"))) + else if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "conversion-type" ) nConversionType = GetConversionTypeFromText( aValue ); } GetConvDicImport().SetLanguage( nLanguage ); @@ -251,7 +251,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("entry"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "entry" ) pContext = new ConvDicXMLEntryTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -264,7 +264,7 @@ SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext( const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("right-text"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "right-text" ) pContext = new ConvDicXMLRightTextContext_Impl( GetConvDicImport(), nPrefix, rLocalName, *this ); else pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); @@ -283,9 +283,9 @@ void ConvDicXMLEntryTextContext_Impl::StartElement( GetKeyByAttrName( aAttrName, &aLocalName ); OUString aValue = rxAttrList->getValueByIndex(i); - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("left-text"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "left-text" ) aLeftText = aValue; - if (nPrefix == XML_NAMESPACE_TCD && aLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("property-type"))) + if ( nPrefix == XML_NAMESPACE_TCD && aLocalName == "property-type" ) nPropertyType = (sal_Int16) aValue.toInt32(); } } @@ -426,7 +426,7 @@ SvXMLImportContext * ConvDicXMLImport::CreateContext( const uno::Reference < xml::sax::XAttributeList > & /*rxAttrList*/ ) { SvXMLImportContext *pContext = 0; - if (nPrefix == XML_NAMESPACE_TCD && rLocalName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("text-conversion-dictionary"))) + if ( nPrefix == XML_NAMESPACE_TCD && rLocalName == "text-conversion-dictionary" ) pContext = new ConvDicXMLDictionaryContext_Impl( *this, nPrefix, rLocalName ); else pContext = new SvXMLImportContext( *this, nPrefix, rLocalName ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index f5488eb2937e..0c8f6bac413f 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -134,8 +134,7 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName ) { MutexGuard aGuard( GetLinguMutex() ); sal_Bool bRes = sal_False; - if (rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_CONV_DICTIONARY)) || - rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SN_HH_CONV_DICTIONARY))) + if ( rServiceName == SN_CONV_DICTIONARY || rServiceName == SN_HH_CONV_DICTIONARY ) bRes = sal_True; return bRes; } |