bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix collateral action of function LoadCharset() which called from schecker.Load(). Bugreport from Vladimir Fyodorov 2:50/15@fidonet

Browse Source
This commit is contained in:
Stas Degteff 2012-05-15 17:02:39 +00:00
parent c21c518165
commit 4b33543f42
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
golded3/geedit.cpp
View File

@ -2851,6 +2851,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
#if defined(GCFG_SPELL_INCLUDED) #if defined(GCFG_SPELL_INCLUDED)
if (CFG->scheckerenabled) if (CFG->scheckerenabled)
{ {
int save_chartableno = LoadCharset(NULL,NULL,1); // Workaround: internal for LoadCharset() charset table number changed in the schecker.Load()
schecker.Init(CFG->xlatlocalset, CFG->scheckerdicpath); schecker.Init(CFG->xlatlocalset, CFG->scheckerdicpath);
char *str = strdup(AA->adat->scheckerdeflang); char *str = strdup(AA->adat->scheckerdeflang);
char *token = strtok(str, " "); char *token = strtok(str, " ");
@ -2861,6 +2862,11 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
token = strtok(NULL, " "); token = strtok(NULL, " ");
} }
free(str); free(str);
if(save_chartableno != -1) // restore value of the default chaset table // workaround: internal for LoadCharset() charset table number changed in the schecker.Load()
LoadCharset(CFG->xlatcharset[save_chartableno].imp, CFG->xlatcharset[save_chartableno].exp);
else
LoadCharset("N/A","N/A");
} }
#endif #endif

5
golded3/gemnus.cpp
View File

@ -1242,7 +1242,12 @@ int GMenuSChecker::Run(CSpellChecker &schecker, const char *word)
{ {
if (!schecker.IsLoaded(langs[finaltag-TAG_LANG-1]->GetLangCode())) if (!schecker.IsLoaded(langs[finaltag-TAG_LANG-1]->GetLangCode()))
{ {
int save_chartableno = LoadCharset(NULL,NULL,1); // Workaround: internal for LoadCharset() charset table number changed in the schecker.Load()
schecker.Load(langs[finaltag-TAG_LANG-1]->GetLangCode(), CFG->scheckeruserdic); schecker.Load(langs[finaltag-TAG_LANG-1]->GetLangCode(), CFG->scheckeruserdic);
if(save_chartableno != -1) // restore value of the default chaset table // workaround: internal for LoadCharset() charset table number changed in the schecker.Load()
LoadCharset(CFG->xlatcharset[save_chartableno].imp, CFG->xlatcharset[save_chartableno].exp);
else
LoadCharset("N/A","N/A");
} }
else else
{ {

19
goldlib/gall/gespell.cpp
View File

@ -359,7 +359,9 @@ void CMSSpellLang::BuildRTable(const char *codeset)
} }
strcpy(codeset2, "CP"); strcpy(codeset2, "CP");
GetLocaleInfo(mLIDC, LOCALE_IDEFAULTANSICODEPAGE, &codeset2[2], sizeof(codeset2)-2); GetLocaleInfo(mLIDC, LOCALE_IDEFAULTANSICODEPAGE, &codeset2[2], sizeof(codeset2)-2);
/*
int save_chartableno = LoadCharset(NULL,NULL,1);
*/
LoadCharset(codeset, codeset2); LoadCharset(codeset, codeset2);
mToDicTable = new Chs; mToDicTable = new Chs;
memset(mToDicTable, 0, sizeof(Chs)); memset(mToDicTable, 0, sizeof(Chs));
@ -369,6 +371,12 @@ void CMSSpellLang::BuildRTable(const char *codeset)
mToLocTable = new Chs; mToLocTable = new Chs;
memset(mToLocTable, 0, sizeof(Chs)); memset(mToLocTable, 0, sizeof(Chs));
if (CharTable ) *mToLocTable = *CharTable; if (CharTable ) *mToLocTable = *CharTable;
/*
if(save_chartableno != -1) // restore value of the default chaset table
LoadCharset(CFG->xlatcharset[save_chartableno].imp, CFG->xlatcharset[save_chartableno].exp);
else
LoadCharset("N/A","N/A");
*/
} }
@ -588,6 +596,9 @@ void CMYSpellLang::BuildRTable(const char *codeset)
"This is bug in program, please make report to developers." ); "This is bug in program, please make report to developers." );
return; return;
} }
/*
int save_chartableno = LoadCharset(NULL,NULL,1);
*/
LoadCharset(codeset, mMSpell->get_dic_encoding()); LoadCharset(codeset, mMSpell->get_dic_encoding());
mToDicTable = new Chs; mToDicTable = new Chs;
memset(mToDicTable, 0, sizeof(Chs)); memset(mToDicTable, 0, sizeof(Chs));
@ -597,6 +608,12 @@ void CMYSpellLang::BuildRTable(const char *codeset)
mToLocTable = new Chs; mToLocTable = new Chs;
memset(mToLocTable, 0, sizeof(Chs)); memset(mToLocTable, 0, sizeof(Chs));
if (CharTable ) *mToLocTable = *CharTable; if (CharTable ) *mToLocTable = *CharTable;
/*
if(save_chartableno != -1) // restore value of the default chaset table
LoadCharset(CFG->xlatcharset[save_chartableno].imp, CFG->xlatcharset[save_chartableno].exp);
else
LoadCharset("N/A","N/A");
*/
} }