r13779 by jghali - #8286 : page copied incorrectly if there are empty layers
scribus-commit
scribus-commit at lists.scribus.net
Thu Jul 16 19:35:15 CEST 2009
Revision: 13779
Author: jghali
Date: 2009-07-16T17:31:17.669274Z
Commit message: #8286 : page copied incorrectly if there are empty layers
Changeset:
M /trunk/Scribus/scribus/scribusdoc.cpp
Diffs:
Index: scribus/scribusdoc.cpp
===================================================================
--- scribus/scribusdoc.cpp (revision 13778)
+++ scribus/scribusdoc.cpp (revision 13779)
@@ -4873,6 +4873,10 @@
m_Selection->clear();
delete ss;
}
+ else
+ {
+ itemBuffer.append(QString());
+ }
}
setActiveLayer(currActiveLayer);
}
@@ -4940,7 +4944,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);
@@ -11113,3 +11117,4 @@
return m_serializer;
}
+
More information about the scribus-commit
mailing list