r19659 by jghali - #12848: Patterns made from groups are given black outline on document retrieval

[scribus-commit]

Author: jghali
Date: Fri Dec 12 22:10:13 2014
New Revision: 19659

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19659
Log:
#12848: Patterns made from groups are given black outline on document retrieval

Modified:
    branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19659&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Fri Dec 12 22:10:13 2014
@@ -1370,14 +1370,14 @@
 					Neu->isGroupControl = static_cast<bool>(pite.attribute("isGroupControl", "0").toInt());
 					if (Neu->isGroupControl)
 					{
-						int groupLastItem = pg.attribute("groupsLastItem", "0").toInt();
+						int groupLastItem = pite.attribute("groupsLastItem", "0").toInt();
 						if ((Neu->Groups.count() == 0) || (groupLastItem <= 0)) // Sanity check for some broken files created using buggy development versions.
 						{
 							Neu->isGroupControl = false;
 							Neu->setFillColor("None");
 						}
 						else
-							groupID2.insert(Neu, pite.attribute("groupsLastItem", "0").toInt()+Neu->ItemNr);
+							groupID2.insert(Neu, groupLastItem + Neu->ItemNr);
 					}
 					pa = pa.nextSibling();
 				}
@@ -3322,13 +3322,14 @@
 					Neu->isGroupControl = static_cast<bool>(pite.attribute("isGroupControl", "0").toInt());
 					if (Neu->isGroupControl)
 					{
-						if (Neu->Groups.count() == 0) // Sanity check for some broken files created using buggy development versions.
+						int groupsLastItem = pite.attribute("groupsLastItem", "0").toInt();
+						if ((Neu->Groups.count() == 0) || (groupsLastItem <= 0)) // Sanity check for some broken files created using buggy development versions.
 						{
 							Neu->isGroupControl = false;
 							Neu->setFillColor("None");
 						}
 						else
-							groupID.insert(Neu, pite.attribute("groupsLastItem", "0").toInt()+Neu->ItemNr);
+							groupID.insert(Neu, groupsLastItem + Neu->ItemNr);
 					}
 					pa = pa.nextSibling();
 				}