r17855 by jghali - #11151 related : fix incorrect hyphenation settings being stored by doc prefs

[scribus-commit]

Author: jghali
Date: Mon Nov  5 22:19:37 2012
New Revision: 17855

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17855
Log:
#11151 related : fix incorrect hyphenation settings being stored by doc prefs

Modified:
    trunk/Scribus/scribus/hyphenator.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/hyphenator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17855&path=/trunk/Scribus/scribus/hyphenator.cpp
==============================================================================
--- trunk/Scribus/scribus/hyphenator.cpp (original)
+++ trunk/Scribus/scribus/hyphenator.cpp Mon Nov  5 22:19:37 2012
@@ -141,7 +141,7 @@
 	doc->setHyphMinimumWordLength(Wordlen);
 	doc->setHyphAutomatic(Autom);
 	doc->setHyphAutoCheck(AutoCheck);
-	doc->setHyphAutoCheck(Num);
+	doc->setHyphConsecutiveLines(Num);
 }
 
 void Hyphenator::slotHyphenateWord(PageItem* it, const QString& text, int firstC)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17855&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Mon Nov  5 22:19:37 2012
@@ -16137,7 +16137,7 @@
 */
 
 	docHyphenator->slotNewSettings(docPrefsData.hyphPrefs.MinWordLen,
-											!docPrefsData.hyphPrefs.Automatic,
+											docPrefsData.hyphPrefs.Automatic,
 											docPrefsData.hyphPrefs.AutoCheck,
 											docPrefsData.hyphPrefs.HyCount);
 	docHyphenator->ignoredWords = docPrefsData.hyphPrefs.ignoredWords;