diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 11:26:03 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-09-17 11:26:03 +0000 |
| commit | 708192e04e3297f17968d6a568417b7e527c81d4 (patch) | |
| tree | 3b2c053087fb72d2bd0ee1185d6da81177e2191f /sw/source/ui/app/docshini.cxx | |
| parent | adc470c2bd8f0495702211d04757ac22f321a09b (diff) | |
CWS-TOOLING: integrate CWS defaultdoclang
2009-08-21 14:44:21 +0200 cmc r275260 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@275001 (milestone: DEV300:m55)
2009-08-10 17:43:32 +0200 cmc r274833 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@274622 (milestone: DEV300:m54)
2009-07-24 11:46:58 +0200 cmc r274297 : CWS-TOOLING: rebase CWS defaultdoclang to trunk@274203 (milestone: DEV300:m53)
2009-07-10 12:22:16 +0200 cmc r273884 : #i99577# tweak the widths a bit
2009-07-08 15:17:58 +0200 cmc r273834 : #i99577 tidy up indentation
2009-07-04 16:09:18 +0200 cmc r273721 : #i99577# a "default" document language that reflects what the locale language is
Diffstat (limited to 'sw/source/ui/app/docshini.cxx')
| -rw-r--r-- | sw/source/ui/app/docshini.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx index e355dcba5e64..630d836c785b 100644 --- a/sw/source/ui/app/docshini.cxx +++ b/sw/source/ui/app/docshini.cxx @@ -37,6 +37,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif +#include <i18npool/mslangid.hxx> #include <sot/storinfo.hxx> #include <sot/storage.hxx> #include <svtools/zforlist.hxx> @@ -58,6 +59,7 @@ #endif #include <linguistic/lngprops.hxx> #include <com/sun/star/document/UpdateDocMode.hpp> +#include <com/sun/star/i18n/ScriptType.hpp> #include <rtl/logfile.hxx> #include <sfx2/docfilt.hxx> #include <svx/xtable.hxx> @@ -791,9 +793,9 @@ void SwDocShell::SubInitNew() SvtLinguConfig().GetOptions( aLinguOpt ); - sal_Int16 nVal = aLinguOpt.nDefaultLanguage, - eCJK = aLinguOpt.nDefaultLanguage_CJK, - eCTL = aLinguOpt.nDefaultLanguage_CTL; + sal_Int16 nVal = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage, ::com::sun::star::i18n::ScriptType::LATIN), + eCJK = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CJK, ::com::sun::star::i18n::ScriptType::ASIAN), + eCTL = MsLangId::resolveSystemLanguageByScriptType(aLinguOpt.nDefaultLanguage_CTL, ::com::sun::star::i18n::ScriptType::COMPLEX); aDfltSet.Put( SvxLanguageItem( nVal, RES_CHRATR_LANGUAGE ) ); aDfltSet.Put( SvxLanguageItem( eCJK, RES_CHRATR_CJK_LANGUAGE ) ); aDfltSet.Put( SvxLanguageItem( eCTL, RES_CHRATR_CTL_LANGUAGE ) ); |