r17969 by fschmid - Fixed Bug #11278: Scribus crashes when color management is disabled

[scribus-commit]

Author: fschmid
Date: Tue Dec 18 19:24:35 2012
New Revision: 17969

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17969
Log:
Fixed Bug #11278: Scribus crashes when color management is disabled

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17969&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue Dec 18 19:24:35 2012
@@ -1269,10 +1269,10 @@
 {
 	// replace names in items
 
-#ifndef QT_NO_CONCURRENT
-	QtConcurrent::blockingMap(DocItems, ResMapped(newNames));
-	QtConcurrent::blockingMap(MasterItems, ResMapped(newNames));
-#else
+//#ifndef QT_NO_CONCURRENT
+//	QtConcurrent::blockingMap(DocItems, ResMapped(newNames));
+//	QtConcurrent::blockingMap(MasterItems, ResMapped(newNames));
+//#else
 
 	QList<PageItem*> * itemlist = & MasterItems;
 	while (itemlist != NULL)
@@ -1288,7 +1288,7 @@
 		else
 			itemlist = NULL;
 	}
-#endif
+//#endif
 	foreach (NotesStyle* nStyle, m_docNotesStylesList)
 	{ //update styles names in notes styles
 		if (nStyle == NULL)
@@ -5025,14 +5025,14 @@
 		}
 	}
 
-#ifndef QT_NO_CONCURRENT
-	QtConcurrent::blockingMap(DocItems, &ScribusDoc::recalculateColorItem);
-	QtConcurrent::blockingMap(MasterItems, &ScribusDoc::recalculateColorItem);
-#else
+//#ifndef QT_NO_CONCURRENT
+//	QtConcurrent::blockingMap(DocItems, &ScribusDoc::recalculateColorItem);
+//	QtConcurrent::blockingMap(MasterItems, &ScribusDoc::recalculateColorItem);
+//#else
 
 	recalculateColorsList(&DocItems);
 	recalculateColorsList(&MasterItems);
-#endif
+//#endif
 	QList<PageItem*> itemList = FrameItems.values();
 	recalculateColorsList(&itemList);
 	QList<PageItem*> allItems;
@@ -9985,13 +9985,13 @@
 	QList<PageItem*> allItems;
 	QStringList patterns = docPatterns.keys();
 
-#ifndef QT_NO_CONCURRENT
-	int lowRes = 0;
-	if (applyNewRes)
-		lowRes = docPrefsData.itemToolPrefs.imageLowResType;
-	QtConcurrent::blockingMap(DocItems, PicResMapped(applyNewRes, lowRes));
-	QtConcurrent::blockingMap(MasterItems, PicResMapped(applyNewRes, lowRes));
-#else
+//#ifndef QT_NO_CONCURRENT
+//	int lowRes = 0;
+//	if (applyNewRes)
+//		lowRes = docPrefsData.itemToolPrefs.imageLowResType;
+//	QtConcurrent::blockingMap(DocItems, PicResMapped(applyNewRes, lowRes));
+//	QtConcurrent::blockingMap(MasterItems, PicResMapped(applyNewRes, lowRes));
+//#else
 	int cc = 0;
 	for (int a = 0; a < DocItems.count(); ++a)
 	{
@@ -10120,7 +10120,7 @@
 		}
 		allItems.clear();
 	}
-#endif
+//#endif
 	for (QHash<int, PageItem*>::iterator it = FrameItems.begin(); it != FrameItems.end(); ++it)
 	{
 		PageItem *currItem = it.value();