ditch unused LANGUAGE_USER[1-9]

Change-Id: I5a3b2b27fa2a7ad22cab2ae6d833707f9e490f27

5 files changed, 1 insertions, 37 deletions

diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index b761fff8aed3..e3643fc1cf15 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -375,18 +375,6 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_YORUBA                     0x046A
 #define LANGUAGE_ZULU                       0x0435
 
-/* Not real, but used for legacy. */
-#define LANGUAGE_USER1                      0x0201
-#define LANGUAGE_USER2                      0x0202
-#define LANGUAGE_USER3                      0x0203
-#define LANGUAGE_USER4                      0x0204
-#define LANGUAGE_USER5                      0x0205
-#define LANGUAGE_USER6                      0x0206
-#define LANGUAGE_USER7                      0x0207
-#define LANGUAGE_USER8                      0x0208
-#define LANGUAGE_USER9                      0x0209
-/* Don't use higher USER values here, we reserve them for extension. */
-
 /*! use only for import/export of MS documents, number formatter maps it to
  *! LANGUAGE_SYSTEM and then to effective system language */
 #define LANGUAGE_SYSTEM_DEFAULT             0x0800
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 9b74545534b2..ca86a9fb4ba5 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -140,16 +140,6 @@ void RscLangEnum::Init( RscNameTable& rNames )
             nTokenCounter++;
         }
     }
-
-    SetConstant( rNames.Put( "LANGUAGE_USER1", CONSTNAME, LANGUAGE_USER1 ), LANGUAGE_USER1 );
-    SetConstant( rNames.Put( "LANGUAGE_USER2", CONSTNAME, LANGUAGE_USER2 ), LANGUAGE_USER2 );
-    SetConstant( rNames.Put( "LANGUAGE_USER3", CONSTNAME, LANGUAGE_USER3 ), LANGUAGE_USER3 );
-    SetConstant( rNames.Put( "LANGUAGE_USER4", CONSTNAME, LANGUAGE_USER4 ), LANGUAGE_USER4 );
-    SetConstant( rNames.Put( "LANGUAGE_USER5", CONSTNAME, LANGUAGE_USER5 ), LANGUAGE_USER5 );
-    SetConstant( rNames.Put( "LANGUAGE_USER6", CONSTNAME, LANGUAGE_USER6 ), LANGUAGE_USER6 );
-    SetConstant( rNames.Put( "LANGUAGE_USER7", CONSTNAME, LANGUAGE_USER7 ), LANGUAGE_USER7 );
-    SetConstant( rNames.Put( "LANGUAGE_USER8", CONSTNAME, LANGUAGE_USER8 ), LANGUAGE_USER8 );
-    SetConstant( rNames.Put( "EXTERN", CONSTNAME, LANGUAGE_USER9 ), LANGUAGE_USER9 );
 }
 
 Atom RscLangEnum::AddLanguage( const char* pLang, RscNameTable& rNames )
diff --git a/svtools/langsupport/langsupport.cxx b/svtools/langsupport/langsupport.cxx
index 1d5cf7f65232..efcc5f550ee2 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -65,9 +65,6 @@ SAL_IMPLEMENT_MAIN()
         {
             LanguageType eLang = aTable.GetTypeAtIndex(i);
 
-            if (eLang >= LANGUAGE_USER1 && eLang <= LANGUAGE_USER9)
-                continue;
-
             if (eLang == LANGUAGE_DONTKNOW ||
                 eLang == LANGUAGE_NONE ||
                 eLang == LANGUAGE_HID_HUMAN_INTERFACE_DEVICE ||
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index eb777d354813..cafddd7d870f 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -194,15 +194,6 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Ukrainian" ; LANGUAGE_UKRAINIAN ; > ;
         < "Uzbek Latin" ; LANGUAGE_UZBEK_LATIN ; > ;
         < "Welsh" ; LANGUAGE_WELSH ; > ;
-        < "User 1" ; LANGUAGE_USER1 ; > ;
-        < "User 2" ; LANGUAGE_USER2 ; > ;
-        < "User 3" ; LANGUAGE_USER3 ; > ;
-        < "User 4" ; LANGUAGE_USER4 ; > ;
-        < "User 5" ; LANGUAGE_USER5 ; > ;
-        < "User 6" ; LANGUAGE_USER6 ; > ;
-        < "User 7" ; LANGUAGE_USER7 ; > ;
-        < "User 8" ; LANGUAGE_USER8 ; > ;
-        < "User 9" ; LANGUAGE_USER9 ; > ;
         < "Latin" ; LANGUAGE_LATIN ; > ;
         < "Esperanto" ; LANGUAGE_USER_ESPERANTO ; > ;
         < "Kinyarwanda (Rwanda)" ; LANGUAGE_USER_KINYARWANDA ; > ;
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index a4aac24c93a9..5dca172caa90 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -168,8 +168,7 @@ void SvxLanguageBox::Init()
 
             bool bInsert = true;
             if ((LANGUAGE_DONTKNOW == nLangType)  ||
-                (LANGUAGE_SYSTEM   == nLangType)  ||
-                (LANGUAGE_USER1 <= nLangType  &&  nLangType <= LANGUAGE_USER9))
+                (LANGUAGE_SYSTEM   == nLangType))
             {
                 bInsert = false;
             }
@@ -289,7 +288,6 @@ void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
             if ( nLangType != LANGUAGE_DONTKNOW &&
                  nLangType != LANGUAGE_SYSTEM &&
                  nLangType != LANGUAGE_NONE &&
-                 (nLangType < LANGUAGE_USER1 || nLangType > LANGUAGE_USER9) &&
                  (MsLangId::getSubLanguage( nLangType) != 0 ||
                   (nLangList & LANG_LIST_ALSO_PRIMARY_ONLY)) &&
                  ((nLangList & LANG_LIST_ALL) != 0 ||