diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-11 15:16:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-12 08:26:40 +0100 |
| commit | a62c2a5fa5d5be465b0edab6adeb1fd16ace462f (patch) | |
| tree | 47cf29b4b7a0ba3ce321ce628a6b0a6175d978d7 /linguistic | |
| parent | cff72ec4bf87c6484be97d954966309ba7a5eb8a (diff) | |
Don't hold css::uno::Type instances by pointer
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/lngopt.cxx | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 800ed673994e..694d6a714f87 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -146,47 +146,47 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps() { static const SfxItemPropertyMapEntry aLinguProps[] = { - { MAP_CHAR_LEN(UPN_DEFAULT_LANGUAGE), WID_DEFAULT_LANGUAGE, - &::getCppuType( (sal_Int16*)0 ), 0, 0 }, - { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE), WID_DEFAULT_LOCALE, - &::getCppuType( (Locale* )0), 0, 0 }, - { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE_CJK), WID_DEFAULT_LOCALE_CJK, - &::getCppuType( (Locale* )0), 0, 0 }, - { MAP_CHAR_LEN(UPN_DEFAULT_LOCALE_CTL), WID_DEFAULT_LOCALE_CTL, - &::getCppuType( (Locale* )0), 0, 0 }, - { MAP_CHAR_LEN(UPN_HYPH_MIN_LEADING), WID_HYPH_MIN_LEADING, - &::getCppuType( (sal_Int16*)0 ), 0, 0 }, - { MAP_CHAR_LEN(UPN_HYPH_MIN_TRAILING), WID_HYPH_MIN_TRAILING, - &::getCppuType( (sal_Int16*)0 ), 0, 0 }, - { MAP_CHAR_LEN(UPN_HYPH_MIN_WORD_LENGTH), WID_HYPH_MIN_WORD_LENGTH, - &::getCppuType( (sal_Int16*)0 ), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/ - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_HYPH_AUTO), WID_IS_HYPH_AUTO, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_HYPH_SPECIAL), WID_IS_HYPH_SPECIAL, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_IGNORE_CONTROL_CHARACTERS), WID_IS_IGNORE_CONTROL_CHARACTERS, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_AUTO), WID_IS_SPELL_AUTO, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_CAPITALIZATION), WID_IS_SPELL_CAPITALIZATION, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_HIDE), WID_IS_SPELL_HIDE, /*! deprecated !*/ - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_IN_ALL_LANGUAGES), WID_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/ - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_SPECIAL), WID_IS_SPELL_SPECIAL, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_UPPER_CASE), WID_IS_SPELL_UPPER_CASE, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_WITH_DIGITS), WID_IS_SPELL_WITH_DIGITS, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_USE_DICTIONARY_LIST), WID_IS_USE_DICTIONARY_LIST, - &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_WRAP_REVERSE), WID_IS_WRAP_REVERSE, - &::getBooleanCppuType(), 0, 0 }, - { 0,0,0,0,0,0 } + { OUString(UPN_DEFAULT_LANGUAGE), WID_DEFAULT_LANGUAGE, + ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + { OUString(UPN_DEFAULT_LOCALE), WID_DEFAULT_LOCALE, + ::getCppuType( (Locale* )0), 0, 0 }, + { OUString(UPN_DEFAULT_LOCALE_CJK), WID_DEFAULT_LOCALE_CJK, + ::getCppuType( (Locale* )0), 0, 0 }, + { OUString(UPN_DEFAULT_LOCALE_CTL), WID_DEFAULT_LOCALE_CTL, + ::getCppuType( (Locale* )0), 0, 0 }, + { OUString(UPN_HYPH_MIN_LEADING), WID_HYPH_MIN_LEADING, + ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + { OUString(UPN_HYPH_MIN_TRAILING), WID_HYPH_MIN_TRAILING, + ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + { OUString(UPN_HYPH_MIN_WORD_LENGTH), WID_HYPH_MIN_WORD_LENGTH, + ::getCppuType( (sal_Int16*)0 ), 0, 0 }, + { OUString(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/ + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_HYPH_AUTO), WID_IS_HYPH_AUTO, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_HYPH_SPECIAL), WID_IS_HYPH_SPECIAL, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_IGNORE_CONTROL_CHARACTERS), WID_IS_IGNORE_CONTROL_CHARACTERS, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_AUTO), WID_IS_SPELL_AUTO, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_CAPITALIZATION), WID_IS_SPELL_CAPITALIZATION, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_HIDE), WID_IS_SPELL_HIDE, /*! deprecated !*/ + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_IN_ALL_LANGUAGES), WID_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/ + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_SPECIAL), WID_IS_SPELL_SPECIAL, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_UPPER_CASE), WID_IS_SPELL_UPPER_CASE, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_SPELL_WITH_DIGITS), WID_IS_SPELL_WITH_DIGITS, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_USE_DICTIONARY_LIST), WID_IS_USE_DICTIONARY_LIST, + ::getBooleanCppuType(), 0, 0 }, + { OUString(UPN_IS_WRAP_REVERSE), WID_IS_WRAP_REVERSE, + ::getBooleanCppuType(), 0, 0 }, + { OUString(), 0, css::uno::Type(), 0, 0 } }; return aLinguProps; } |