Author: fschmid
Date: Sat Apr 11 09:01:36 2015
New Revision: 19988
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19988
Log:
Fixed Bug #12247: Ungroup crashes (most likely caused by copy/paste)
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19988&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
Sat Apr 11 09:01:36 2015
@@ -315,12 +315,13 @@
m_Doc->MLineStyles.insert(mlName, ml);
}
}
- if ((tagName == "ITEM") || (tagName == "FRAMEOBJECT"))
+ if ((tagName == "ITEM") || (tagName == "PAGEOBJECT") ||
(tagName == "FRAMEOBJECT"))
{
ItemInfo itemInfo;
success = readObject(m_Doc, reader, itemInfo, fileDir,
true);
if (!success)
break;
+ itemInfo.item->LayerID = LayerToPaste;
if (isNewFormat)
{
if (itemInfo.nextItem != -1)
@@ -3940,6 +3941,7 @@
PageItem* currItem = GroupItems.at(as);
newItem->groupItemList.append(currItem);
currItem->Parent = newItem;
+ currItem->LayerID = newItem->LayerID;
}
doc->Items = DItems;
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
