Bump hunspell some more, add it some real finding/use of dicts from common locations

git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17490 11d20701-8431-0410-a711-e3c959e3b870

1 files changed, 8 insertions, 4 deletions

diff --git a/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp b/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
index 8322a0d..b10a56f 100644
--- a/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
+++ b/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
@@ -30,15 +30,19 @@ HunspellDialog::HunspellDialog(QWidget *parent, ScribusDoc *doc, StoryText *iTex
 	m_primaryLangIndex=0;
 }
 
-void HunspellDialog::set(QStringList *dictEntries, Hunspell **hspellers, QList<WordsFound> *wfList)
+void HunspellDialog::set(QMap<QString, QString>* dictionaryMap, Hunspell **hspellers, QList<WordsFound> *wfList)
 {
-	m_dictEntries=dictEntries;
+	m_dictionaryMap=dictionaryMap;
 	m_hspellers=hspellers;
 	m_wfList=wfList;
 	bool b=languagesComboBox->blockSignals(true);
 	languagesComboBox->clear();
-	for(int i=0;i<dictEntries->count();++i)
-		languagesComboBox->addItem(LanguageManager::instance()->getLangFromAbbrev(dictEntries->at(i), true));
+	QMap<QString, QString>::iterator it = m_dictionaryMap->begin();
+	while (it != dictionaryMap->end())
+	{
+		languagesComboBox->addItem(LanguageManager::instance()->getLangFromAbbrev(it.key(), true));
+		++it;
+	}
 	languagesComboBox->setCurrentIndex(0);
 	m_primaryLangIndex=0;
 	languagesComboBox->blockSignals(b);