r23203 by jghali - #15824: Removing Hyphenation character in paragraph style is not working

[scribus-commit]

Author: jghali
Date: Thu Sep 19 23:10:58 2019
New Revision: 23203

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23203
Log:
#15824: Removing Hyphenation character in paragraph style is not working

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

Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23203&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp	(original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp	Thu Sep 19 23:10:58 2019
@@ -1807,13 +1807,13 @@
 {
 	if (m_pwidget->cpage->hyphenCharLineEdit->useParentValue())
 		for (int i = 0; i < m_selection.count(); ++i)
-			m_selection[i]->charStyle().resetHyphenWordMin();
-	else
-	{
-		int wm = m_pwidget->cpage->smallestWordSpinBox->value();
-
-		for (int i = 0; i < m_selection.count(); ++i)
-			m_selection[i]->charStyle().setHyphenWordMin(wm);
+			m_selection[i]->charStyle().resetHyphenChar();
+	else
+	{
+		QString hyphenText = m_pwidget->cpage->hyphenCharLineEdit->text();
+		uint ch = hyphenText.isEmpty() ? 0 : hyphenText.toUcs4()[0];
+		for (int i = 0; i < m_selection.count(); ++i)
+			m_selection[i]->charStyle().setHyphenChar(ch);
 	}
 
 	if (!m_selectionIsDirty)
@@ -2987,8 +2987,8 @@
 			m_selection[i]->resetHyphenChar();
 	else
 	{
-		QString hypenText = m_page->hyphenCharLineEdit->text();
-		uint ch = hypenText.isEmpty() ? 0 : hypenText.toUcs4()[0];
+		QString hyphenText = m_page->hyphenCharLineEdit->text();
+		uint ch = hyphenText.isEmpty() ? 0 : hyphenText.toUcs4()[0];
 		for (int i = 0; i < m_selection.count(); ++i)
 			m_selection[i]->setHyphenChar(ch);
 	}