r13778 by jghali - #8286 : page copied incorrectly if there are empty layers

scribus-commit scribus-commit at lists.scribus.net
Thu Jul 16 19:30:15 CEST 2009


Revision: 13778
Author: jghali
Date: 2009-07-16T17:26:09.084547Z
Commit message: #8286 : page copied incorrectly if there are empty layers

Changeset: 
M  /branches/Version135/Scribus/scribus/scribusdoc.cpp

Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp	(revision 13777)
+++ scribus/scribusdoc.cpp	(revision 13778)
@@ -4861,6 +4861,10 @@
 					m_Selection->clear();
 					delete ss;
 				}
+				else
+				{
+					itemBuffer.append(QString());
+				}
 			}
 			setActiveLayer(currActiveLayer);
 		}
@@ -4926,7 +4930,7 @@
 				int currActiveLayer = activeLayer();
 				for (it = Layers.begin(); it != Layers.end(); ++it)
 				{
-					if (lcount < itemBuffer.count())
+					if ((lcount < itemBuffer.count()) && !itemBuffer[lcount].isEmpty())
 					{
 						ScriXmlDoc *ss = new ScriXmlDoc();
 						ss->ReadElemToLayer(itemBuffer[lcount], prefsData.AvailFonts, this, destination->xOffset(), destination->yOffset(), false, true, prefsData.GFontSub, view(),(*it).LNr);




More information about the scribus-commit mailing list