r18839 by craig - #12093: Fix crash on language change due to hyphenation texts missing

[scribus-commit]

Author: craig
Date: Tue Feb 25 20:02:47 2014
New Revision: 18839

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18839
Log:
#12093: Fix crash on language change due to hyphenation texts missing

Modified:
    trunk/Scribus/scribus/ui/smcstylewidget.cpp
    trunk/Scribus/scribus/ui/smtextstyles.cpp

Modified: trunk/Scribus/scribus/ui/smcstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18839&path=/trunk/Scribus/scribus/ui/smcstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smcstylewidget.cpp Tue Feb 25 20:02:47 2014
@@ -278,22 +278,22 @@
 	for (int i = 0; i < language_->count(); ++i)
 	{
 		QString ltAbbrev=LanguageManager::instance()->getAbbrevFromLang(language_->itemText(i), true, false);
-		//qDebug()<<"ltabbrev"<<ltAbbrev<<language_->itemText(i);
+//		qDebug()<<"ltabbrev"<<ltAbbrev<<language_->itemText(i);
 		if (ltAbbrev == clang)
 			ci = i;
 		
 		if (hasParent && ltAbbrev == plang)
 			pi = i;
 		tl=defLang;
-		//qDebug() << i << language_->itemText(i) << defLang << langMap_[defLang] << tl;
+//		qDebug() << i << language_->itemText(i) << defLang << langMap_[defLang] << tl;
 		if (ltAbbrev == defLang || ltAbbrev == tl)
-// 		{
+//		{
 			di = i;
-			//qDebug() << "match on:" << di;
-// 		}
-	}
-
-	//qDebug() << QString("SMCStyleWidget::show(): deflan='%1'->'%2'").arg(defLang).arg(langMap_[defLang]);
+//			qDebug() << "match on:" << di;
+//		}
+	}
+
+	qDebug() << QString("SMCStyleWidget::show(): deflan='%1'->'%2'").arg(defLang).arg(langMap_[defLang]);
 	Q_ASSERT(di != -1);
 
 	if (hasParent)

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18839&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp (original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp Tue Feb 25 20:02:47 2014
@@ -464,6 +464,9 @@
 	{
 		m_pwidget->languageChange();
 		m_pwidget->cpage->languageChange();
+		QStringList languageList;
+		LanguageManager::instance()->fillInstalledHyphStringList(&languageList);
+		m_pwidget->cpage->fillLangComboFromList(languageList);
 	}
 }