no need to redeclare these constants with slightly different names

Change-Id: Ic9a1f2f0cef25baaf8b97db4989dc536a5da89f7

1 files changed, 37 insertions, 37 deletions

diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 38327b8eff87..d07b4da92964 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -98,29 +98,29 @@ struct WID_Name
 WID_Name aWID_Name[] =
 {
     { 0,                                  0 },
-    { WID_IS_USE_DICTIONARY_LIST,         UPN_IS_USE_DICTIONARY_LIST },
-    { WID_IS_IGNORE_CONTROL_CHARACTERS,   UPN_IS_IGNORE_CONTROL_CHARACTERS },
-    { WID_IS_SPELL_UPPER_CASE,            UPN_IS_SPELL_UPPER_CASE },
-    { WID_IS_SPELL_WITH_DIGITS,           UPN_IS_SPELL_WITH_DIGITS },
-    { WID_IS_SPELL_CAPITALIZATION,        UPN_IS_SPELL_CAPITALIZATION },
-    { WID_HYPH_MIN_LEADING,               UPN_HYPH_MIN_LEADING },
-    { WID_HYPH_MIN_TRAILING,              UPN_HYPH_MIN_TRAILING },
-    { WID_HYPH_MIN_WORD_LENGTH,           UPN_HYPH_MIN_WORD_LENGTH },
-    { WID_DEFAULT_LOCALE,                 UPN_DEFAULT_LOCALE },
-    { WID_IS_SPELL_AUTO,                  UPN_IS_SPELL_AUTO },
+    { UPH_IS_USE_DICTIONARY_LIST,         UPN_IS_USE_DICTIONARY_LIST },
+    { UPH_IS_IGNORE_CONTROL_CHARACTERS,   UPN_IS_IGNORE_CONTROL_CHARACTERS },
+    { UPH_IS_SPELL_UPPER_CASE,            UPN_IS_SPELL_UPPER_CASE },
+    { UPH_IS_SPELL_WITH_DIGITS,           UPN_IS_SPELL_WITH_DIGITS },
+    { UPH_IS_SPELL_CAPITALIZATION,        UPN_IS_SPELL_CAPITALIZATION },
+    { UPH_HYPH_MIN_LEADING,               UPN_HYPH_MIN_LEADING },
+    { UPH_HYPH_MIN_TRAILING,              UPN_HYPH_MIN_TRAILING },
+    { UPH_HYPH_MIN_WORD_LENGTH,           UPN_HYPH_MIN_WORD_LENGTH },
+    { UPH_DEFAULT_LOCALE,                 UPN_DEFAULT_LOCALE },
+    { UPH_IS_SPELL_AUTO,                  UPN_IS_SPELL_AUTO },
     { 0,                                  0 },
     { 0,                                  0 },
-    { WID_IS_SPELL_SPECIAL,               UPN_IS_SPELL_SPECIAL },
-    { WID_IS_HYPH_AUTO,                   UPN_IS_HYPH_AUTO },
-    { WID_IS_HYPH_SPECIAL,                UPN_IS_HYPH_SPECIAL },
-    { WID_IS_WRAP_REVERSE,                UPN_IS_WRAP_REVERSE },
+    { UPH_IS_SPELL_SPECIAL,               UPN_IS_SPELL_SPECIAL },
+    { UPH_IS_HYPH_AUTO,                   UPN_IS_HYPH_AUTO },
+    { UPH_IS_HYPH_SPECIAL,                UPN_IS_HYPH_SPECIAL },
+    { UPH_IS_WRAP_REVERSE,                UPN_IS_WRAP_REVERSE },
     { 0,                                  0 },
     { 0,                                  0 },
     { 0,                                  0 },
     { 0,                                  0 },
-    { WID_DEFAULT_LANGUAGE,               UPN_DEFAULT_LANGUAGE },
-    { WID_DEFAULT_LOCALE_CJK,             UPN_DEFAULT_LOCALE_CJK },
-    { WID_DEFAULT_LOCALE_CTL,             UPN_DEFAULT_LOCALE_CTL }
+    { UPH_DEFAULT_LANGUAGE,               UPN_DEFAULT_LANGUAGE },
+    { UPH_DEFAULT_LOCALE_CJK,             UPN_DEFAULT_LOCALE_CJK },
+    { UPH_DEFAULT_LOCALE_CTL,             UPN_DEFAULT_LOCALE_CTL }
 };
 
 
@@ -146,45 +146,45 @@ static const SfxItemPropertyMapEntry* lcl_GetLinguProps()
 {
     static const SfxItemPropertyMapEntry aLinguProps[] =
     {
-        { OUString(UPN_DEFAULT_LANGUAGE),           WID_DEFAULT_LANGUAGE,
+        { OUString(UPN_DEFAULT_LANGUAGE),           UPH_DEFAULT_LANGUAGE,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { OUString(UPN_DEFAULT_LOCALE),             WID_DEFAULT_LOCALE,
+        { OUString(UPN_DEFAULT_LOCALE),             UPH_DEFAULT_LOCALE,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { OUString(UPN_DEFAULT_LOCALE_CJK),         WID_DEFAULT_LOCALE_CJK,
+        { OUString(UPN_DEFAULT_LOCALE_CJK),         UPH_DEFAULT_LOCALE_CJK,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { OUString(UPN_DEFAULT_LOCALE_CTL),         WID_DEFAULT_LOCALE_CTL,
+        { OUString(UPN_DEFAULT_LOCALE_CTL),         UPH_DEFAULT_LOCALE_CTL,
                 ::cppu::UnoType<Locale>::get(),       0, 0 },
-        { OUString(UPN_HYPH_MIN_LEADING),           WID_HYPH_MIN_LEADING,
+        { OUString(UPN_HYPH_MIN_LEADING),           UPH_HYPH_MIN_LEADING,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { OUString(UPN_HYPH_MIN_TRAILING),          WID_HYPH_MIN_TRAILING,
+        { OUString(UPN_HYPH_MIN_TRAILING),          UPH_HYPH_MIN_TRAILING,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { OUString(UPN_HYPH_MIN_WORD_LENGTH),       WID_HYPH_MIN_WORD_LENGTH,
+        { OUString(UPN_HYPH_MIN_WORD_LENGTH),       UPH_HYPH_MIN_WORD_LENGTH,
                 ::cppu::UnoType<sal_Int16>::get(),    0, 0 },
-        { OUString(UPN_IS_GERMAN_PRE_REFORM),       WID_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
+        { OUString(UPN_IS_GERMAN_PRE_REFORM),       UPH_IS_GERMAN_PRE_REFORM,       /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_HYPH_AUTO),               WID_IS_HYPH_AUTO,
+        { OUString(UPN_IS_HYPH_AUTO),               UPH_IS_HYPH_AUTO,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_HYPH_SPECIAL),            WID_IS_HYPH_SPECIAL,
+        { OUString(UPN_IS_HYPH_SPECIAL),            UPH_IS_HYPH_SPECIAL,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_IGNORE_CONTROL_CHARACTERS),   WID_IS_IGNORE_CONTROL_CHARACTERS,
+        { OUString(UPN_IS_IGNORE_CONTROL_CHARACTERS),   UPH_IS_IGNORE_CONTROL_CHARACTERS,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_AUTO),              WID_IS_SPELL_AUTO,
+        { OUString(UPN_IS_SPELL_AUTO),              UPH_IS_SPELL_AUTO,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_CAPITALIZATION),    WID_IS_SPELL_CAPITALIZATION,
+        { OUString(UPN_IS_SPELL_CAPITALIZATION),    UPH_IS_SPELL_CAPITALIZATION,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_HIDE),              WID_IS_SPELL_HIDE,              /*! deprecated !*/
+        { OUString(UPN_IS_SPELL_HIDE),              UPH_IS_SPELL_HIDE,              /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_IN_ALL_LANGUAGES),  WID_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
+        { OUString(UPN_IS_SPELL_IN_ALL_LANGUAGES),  UPH_IS_SPELL_IN_ALL_LANGUAGES,  /*! deprecated !*/
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_SPECIAL),           WID_IS_SPELL_SPECIAL,
+        { OUString(UPN_IS_SPELL_SPECIAL),           UPH_IS_SPELL_SPECIAL,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_UPPER_CASE),        WID_IS_SPELL_UPPER_CASE,
+        { OUString(UPN_IS_SPELL_UPPER_CASE),        UPH_IS_SPELL_UPPER_CASE,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_SPELL_WITH_DIGITS),       WID_IS_SPELL_WITH_DIGITS,
+        { OUString(UPN_IS_SPELL_WITH_DIGITS),       UPH_IS_SPELL_WITH_DIGITS,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_USE_DICTIONARY_LIST),     WID_IS_USE_DICTIONARY_LIST,
+        { OUString(UPN_IS_USE_DICTIONARY_LIST),     UPH_IS_USE_DICTIONARY_LIST,
                 cppu::UnoType<bool>::get(),            0, 0 },
-        { OUString(UPN_IS_WRAP_REVERSE),            WID_IS_WRAP_REVERSE,
+        { OUString(UPN_IS_WRAP_REVERSE),            UPH_IS_WRAP_REVERSE,
                 cppu::UnoType<bool>::get(),            0, 0 },
         { OUString(), 0, css::uno::Type(), 0, 0 }
     };