r21209 by fschmid -

[scribus-commit]

Author: fschmid
Date: Mon Apr 18 19:35:51 2016
New Revision: 21209

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21209
Log:
Fixed Bug #13602: Crash on opening SLA with reference to item mark
Have fixed the crash, but somehow saving item marks seems to be buggy.

Modified:
    trunk/Scribus/scribus/plugins/export/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/text/textshaper.cpp

Modified: trunk/Scribus/scribus/plugins/export/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21209&path=/trunk/Scribus/scribus/plugins/export/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/export/CMakeLists.txt	Mon Apr 18 19:35:51 2016
@@ -1,3 +1,4 @@
 ADD_SUBDIRECTORY(pixmapexport)
 ADD_SUBDIRECTORY(svgexplugin)
+ADD_SUBDIRECTORY(textexport)
 ADD_SUBDIRECTORY(xpsexport)

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21209&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt	Mon Apr 18 19:35:51 2016
@@ -1,6 +1,7 @@
 ADD_SUBDIRECTORY(ai)
 ADD_SUBDIRECTORY(cdr)
 ADD_SUBDIRECTORY(cgm)
+ADD_SUBDIRECTORY(cenon)
 ADD_SUBDIRECTORY(cvg)
 ADD_SUBDIRECTORY(drw)
 ADD_SUBDIRECTORY(emf)

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21209&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp	(original)
+++ trunk/Scribus/scribus/scribusdoc.cpp	Mon Apr 18 19:35:51 2016
@@ -16670,7 +16670,8 @@
 		item = DocItems.at(a);
 		if (!item || !item->isTextFrame() || (item->itemText.length() <= 0))
 			continue;
-		for (int i = item->firstInFrame(); i <= item->lastInFrame(); ++i)
+	//	for (int i = item->firstInFrame(); i <= item->lastInFrame(); ++i)
+		for (int i = 0; i < item->itemText.length(); ++i)
 		{
 			if (item->itemText.hasMark(i, mrk))
 			{

Modified: trunk/Scribus/scribus/text/textshaper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21209&path=/trunk/Scribus/scribus/text/textshaper.cpp
==============================================================================
--- trunk/Scribus/scribus/text/textshaper.cpp	(original)
+++ trunk/Scribus/scribus/text/textshaper.cpp	Mon Apr 18 19:35:51 2016
@@ -54,7 +54,7 @@
 	for ( ; m_index < itemText.length(); ++m_index)
 	{
 		Mark* mark = itemText.mark(m_index);
-		if (itemText.hasMark(m_index))
+		if ((mark != NULL) && (itemText.hasMark(m_index)))
 		{
 			mark->OwnPage = m_item->OwnPage;
 			//itemPtr and itemName set to this frame only if mark type is different than MARK2ItemType