diff options
| author | Jean-Noël Rouvignac <jn.rouvignac@gmail.com> | 2013-01-30 11:44:23 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-01-30 12:54:40 +0000 |
| commit | 97eb8a6e0eb830f37dcba64a51d725aab4c5ff53 (patch) | |
| tree | a1a95b8249052d846a997ad1729758168d6a3b24 /linguistic/workben | |
| parent | f8569cd9a28a3a8856dba4ad53218aa6cc073521 (diff) | |
Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd
Reviewed-on: https://gerrit.libreoffice.org/1924
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'linguistic/workben')
| -rw-r--r-- | linguistic/workben/sprophelp.cxx | 14 | ||||
| -rw-r--r-- | linguistic/workben/sspellimp.cxx | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 7360aebc92c4..636866fd2deb 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -40,8 +40,6 @@ using namespace linguistic; using ::rtl::OUString; -#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) - PropertyChgHelper::PropertyChgHelper( @@ -191,32 +189,32 @@ PropertyHelper_Spell::PropertyHelper_Spell( sal_Bool *pbVal = NULL, *pbResVal = NULL; - if (A2OU( UPN_IS_GERMAN_PRE_REFORM ) == pPropName[i]) + if (OUString( UPN_IS_GERMAN_PRE_REFORM ) == pPropName[i]) { pbVal = &bIsGermanPreReform; pbResVal = &bResIsGermanPreReform; } - else if (A2OU( UPN_IS_IGNORE_CONTROL_CHARACTERS ) == pPropName[i]) + else if (OUString( UPN_IS_IGNORE_CONTROL_CHARACTERS ) == pPropName[i]) { pbVal = &bIsIgnoreControlCharacters; pbResVal = &bResIsIgnoreControlCharacters; } - else if (A2OU( UPN_IS_USE_DICTIONARY_LIST ) == pPropName[i]) + else if (OUString( UPN_IS_USE_DICTIONARY_LIST ) == pPropName[i]) { pbVal = &bIsUseDictionaryList; pbResVal = &bResIsUseDictionaryList; } - else if (A2OU( UPN_IS_SPELL_UPPER_CASE ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_UPPER_CASE ) == pPropName[i]) { pbVal = &bIsSpellUpperCase; pbResVal = &bResIsSpellUpperCase; } - else if (A2OU( UPN_IS_SPELL_WITH_DIGITS ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_WITH_DIGITS ) == pPropName[i]) { pbVal = &bIsSpellWithDigits; pbResVal = &bResIsSpellWithDigits; } - else if (A2OU( UPN_IS_SPELL_CAPITALIZATION ) == pPropName[i]) + else if (OUString( UPN_IS_SPELL_CAPITALIZATION ) == pPropName[i]) { pbVal = &bIsSpellCapitalization; pbResVal = &bResIsSpellCapitalization; diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 003ceab5021a..067f9b60f71d 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -90,9 +90,9 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales() { aSuppLocales.realloc( 3 ); Locale *pLocale = aSuppLocales.getArray(); - pLocale[0] = Locale( A2OU("en"), A2OU("US"), OUString() ); - pLocale[1] = Locale( A2OU("de"), A2OU("DE"), OUString() ); - pLocale[2] = Locale( A2OU("de"), A2OU("CH"), OUString() ); + pLocale[0] = Locale( "en", "US", OUString() ); + pLocale[1] = Locale( "de", "DE", OUString() ); + pLocale[2] = Locale( "de", "CH"), OUString() ); } return aSuppLocales; @@ -218,7 +218,7 @@ Reference< XSpellAlternatives > if (STRING_NOTFOUND != aTmp.SearchAscii( "liss" )) { - aTmp.SearchAndReplaceAllAscii( "liss", A2OU("liz") ); + aTmp.SearchAndReplaceAllAscii( "liss", "liz" ); xRes = new SpellAlternatives( aTmp, nLang, SpellFailure::IS_NEGATIVE_WORD, ::com::sun::star::uno::Sequence< ::rtl::OUString >() ); } @@ -334,7 +334,7 @@ OUString SAL_CALL throw(RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - return A2OU( "OpenOffice example spellchecker" ); + return OUString( "OpenOffice example spellchecker" ); } @@ -441,7 +441,7 @@ Sequence< OUString > SpellChecker::getSupportedServiceNames_Static() MutexGuard aGuard( GetLinguMutex() ); Sequence< OUString > aSNS( 1 ); // more than 1 service possible - aSNS.getArray()[0] = A2OU( SN_SPELLCHECKER ); + aSNS.getArray()[0] = SN_SPELLCHECKER; return aSNS; } |