diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 14:28:18 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-04-06 14:30:05 +0200 |
commit | 8a01ee624318ac08800af89d988971114637a04e (patch) | |
tree | e4acf35e42ab0c1d0b593bd8970fa2c435f90c95 /unotools | |
parent | 6cf547f02c79278430ee75483a3128076cfc609e (diff) |
Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:
find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/fontcfg.cxx | 8 | ||||
-rw-r--r-- | unotools/source/config/xmlaccelcfg.cxx | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index cab7eb3dfb12..f65a25d82e98 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -335,11 +335,11 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) { return aFallBackArabic; } - else if( aLocale.Language.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "th" ) ) ) + else if ( aLocale.Language == "th" ) { return aFallBackThai; } - else if( aLocale.Language.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ko" ) ) ) + else if ( aLocale.Language == "ko" ) { return aFallBackKorean; } @@ -355,14 +355,14 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) { return aFallbackLatin2; } - else if( aLocale.Language.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "zh" ) ) ) + else if ( aLocale.Language == "zh" ) { if( ! aLocale.Country.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "cn" ) ) ) return aFallBackChineseTRD; else return aFallBackChineseSIM; } - else if( aLocale.Language.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ja" ) ) ) + else if ( aLocale.Language == "ja" ) { return aFallBackJapanese; } diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 10397c0637db..74a1ed14b984 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -259,7 +259,7 @@ throw( SAXException, RuntimeException ) { m_nElementDepth++; - if ( aElementName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_ACCELERATORLIST ))) + if ( aElementName == ELEMENT_ACCELERATORLIST ) { // acceleratorlist if ( m_bAcceleratorMode ) @@ -271,7 +271,7 @@ throw( SAXException, RuntimeException ) else m_bAcceleratorMode = sal_True; } - else if ( aElementName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_ACCELERATORITEM ))) + else if ( aElementName == ELEMENT_ACCELERATORITEM ) { // accelerator item if ( !m_bAcceleratorMode ) @@ -293,11 +293,11 @@ throw( SAXException, RuntimeException ) OUString aName = xAttrList->getNameByIndex( i ); OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_URL ))) + if ( aName == ATTRIBUTE_URL ) aItem.aCommand = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_MODIFIER ))) + else if ( aName == ATTRIBUTE_MODIFIER ) aItem.nModifier = (sal_uInt16)aValue.toInt32(); - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_KEYCODE ))) + else if ( aName == ATTRIBUTE_KEYCODE ) aItem.nCode = (sal_uInt16)aValue.toInt32(); } @@ -324,7 +324,7 @@ void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName ) { m_nElementDepth--; - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_ACCELERATORLIST ))) + if ( aName == ELEMENT_ACCELERATORLIST ) { // acceleratorlist if ( !m_bAcceleratorMode ) @@ -334,7 +334,7 @@ void SAL_CALL OReadAccelatorDocumentHandler::endElement( const OUString& aName ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_ACCELERATORITEM ))) + else if ( aName == ELEMENT_ACCELERATORITEM ) { if ( !m_bItemCloseExpected ) { |