summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-12-13 19:51:52 +0100
committerEike Rathke <erack@redhat.com>2012-12-13 20:18:56 +0100
commit623410669fa2d5da9a2ce4e3c4b81ce23605a6df (patch)
treef8068bdc447c7aa69b12bc935654ac338abdfb88 /cui/source
parent5deba0e70c9287e6e933df458c21cc3e72f3aa70 (diff)
fdo#58060 use acor_und.dat and LANGUAGE_UNDETERMINED
Previous versions used an empty language tag for LANGUAGE_DONTKNOW with the "[All]" autocorrection entry and read/wrote from/to arco_.dat file. An empty language tag otherwise is used for system locale and doesn't convert flawlessly with the new LanguageTag system. Instead use LANGUAGE_UNDETERMINED with the ISO 639 code 'und' so the file name is "acor_und.dat". During user profile migration an existing 3/user/autocorr/acor_.dat is copied to the new 4/user/autocorr/acor_und.dat Change-Id: I593f24829c6efd58f36e93ebd3385a3c925f7217
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/tabpages/autocdlg.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 66bf164ded56..48bd0c7de2b5 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -111,7 +111,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
// initialize languages
//! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
- //! will be set to LANGUAGE_DONTKNOW
+ //! will be set to LANGUAGE_UNDETERMINED
sal_Int16 nLangList = LANG_LIST_WESTERN;
if( SvtLanguageOptions().IsCTLFontEnabled() )
@@ -120,13 +120,13 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
aLanguageLB.SelectLanguage( LANGUAGE_NONE );
sal_uInt16 nPos = aLanguageLB.GetSelectEntryPos();
DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" );
- aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_DONTKNOW );
+ aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED );
// Initializing doesn't work for static on linux - therefore here
if( LANGUAGE_SYSTEM == eLastDialogLanguage )
eLastDialogLanguage = Application::GetSettings().GetLanguageTag().getLanguageType();
- LanguageType nSelectLang = LANGUAGE_DONTKNOW;
+ LanguageType nSelectLang = LANGUAGE_UNDETERMINED;
nPos = aLanguageLB.GetEntryPos( (void*)(long) eLastDialogLanguage );
if (LISTBOX_ENTRY_NOTFOUND != nPos)
nSelectLang = eLastDialogLanguage;