r20535 by jghali -

[scribus-commit]

Author: jghali
Date: Thu Nov  5 21:50:41 2015
New Revision: 20535

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20535
Log:
#13503: Crash when opening file

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20535&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Thu Nov  5 21:50:41 2015
@@ -1772,6 +1772,9 @@
 
 bool Scribus134Format::readHyphen(ScribusDoc *doc, ScXmlStreamReader& reader)
 {
+	if (!doc->docHyphenator)
+		doc->createHyphenator();
+
 	QStringRef tagName = reader.name();
 	while(!reader.atEnd() && !reader.hasError())
 	{

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20535&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Thu Nov  5 21:50:41 2015
@@ -3508,6 +3508,9 @@
 
 bool Scribus150Format::readHyphen(ScribusDoc *doc, ScXmlStreamReader& reader)
 {
+	if (!doc->docHyphenator)
+		doc->createHyphenator();
+
 	QStringRef tagName = reader.name();
 	while(!reader.atEnd() && !reader.hasError())
 	{

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20535&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Thu Nov  5 21:50:41 2015
@@ -890,7 +890,7 @@
 	if (m_hasGUI)
 	{
 		if (docHyphenator)
-			delete docHyphenator;
+			return;
 		docHyphenator = new Hyphenator(m_ScMW, this);
 		Q_CHECK_PTR(docHyphenator);
 	}