diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 11:24:58 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 11:24:58 +0000 |
| commit | 1871560b930bb84e7ed68aade52a569e26946b9d (patch) | |
| tree | 84f41ae190588ff5227bd0a3fdce6212eefb1f5b /desktop/source | |
| parent | bda5788d8f5004c1932bda264a94153985e0e970 (diff) | |
INTEGRATION: CWS mergebuild (1.2.4); FILE MERGED
2004/05/21 16:55:45 hjs 1.2.4.4: #i8252# switch to Locale
2004/04/21 07:00:26 hjs 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2004/01/29 15:41:45 hjs 1.2.4.2: #i8252# chng. resmgr creation parameters from LanguageType to ::com::sun::star::lang::Locale
2003/12/02 17:28:47 hjs 1.2.4.1: #i8252# change LanguageSelect to use isocodes
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/app/langselect.hxx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index e035ed7e12cf..83788d416dd9 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -2,9 +2,9 @@ * * $RCSfile: langselect.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-01-20 15:48:03 $ + * last change: $Author: hjs $ $Date: 2004-06-25 12:24:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,7 @@ #include <list> #include <tools/string.hxx> #include <tools/lang.hxx> +#include <rtl/ustring.hxx> #include <tools/resid.hxx> #include <vcl/dialog.hxx> #include <vcl/lstbox.hxx> @@ -72,7 +73,8 @@ namespace desktop { -typedef std::list<LanguageType> LangList; +//typedef std::list<LanguageType> LangList; +typedef std::list<rtl::OUString> IsoList; typedef std::list<String> StrList; class LanguageSelection; @@ -81,9 +83,12 @@ class LanguageSelectionDialog : public ModalDialog { friend class LanguageSelection; private: +// LanguageType m_aLanguage; FixedText m_aText; ListBox m_aListBox; OKButton m_aButton; + ModalDialog *m_pDialog; + IsoList m_isoLanguages; public: LanguageSelectionDialog(ResMgr* pResMgr); @@ -94,15 +99,18 @@ class LanguageSelection { private: - static LangList m_lLanguages; + static IsoList m_lLanguages; - static LanguageType getUserLanguage(); - static LangList getInstalledLanguages(); - static StrList getLanguageStrings(const LangList&); +// static LangList getInstalledLanguages(); + static IsoList getInstalledIsoLanguages(); +// static StrList getLanguageStrings(const LangList&); + static StrList getLanguageStrings(const IsoList&); + static rtl::OUString getUserLanguage(); public: static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str); - static LanguageType getLanguageType(); +// static LanguageType getLanguageType(); + static rtl::OUString getLanguageString(); static void prepareLanguage(); }; |