mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00
Code

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alexander 2016-09-16 15:48:18 +04:00
commit f1e0be4a91
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
limereport/lrpagedesignintf.cpp
View File

@ -1803,11 +1803,14 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
if (parentItem){ if (parentItem){
BaseDesignIntf *item = page()->addReportItem(reader->itemClassName(), parentItem, parentItem); BaseDesignIntf *item = page()->addReportItem(reader->itemClassName(), parentItem, parentItem);
if (item) { if (item) {
m_itemNames.push_back(item->objectName()); QString objectName = item->objectName();
reader->readItem(item); reader->readItem(item);
item->setParent(parentItem); item->setParent(parentItem);
item->setParentItem(parentItem); item->setParentItem(parentItem);
item->setObjectName(m_itemNames.last()); if (page()->reportItemsByName(item->objectName()).size()>1){
item->setObjectName(objectName);
}
m_itemNames.push_back(item->objectName());
} }
return true; return true;
} }