mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
Merge branch 'master' into 1.4
This commit is contained in:
commit
f1e0be4a91
@ -1803,11 +1803,14 @@ bool PasteCommand::insertItem(ItemsReaderIntf::Ptr reader)
|
||||
if (parentItem){
|
||||
BaseDesignIntf *item = page()->addReportItem(reader->itemClassName(), parentItem, parentItem);
|
||||
if (item) {
|
||||
m_itemNames.push_back(item->objectName());
|
||||
QString objectName = item->objectName();
|
||||
reader->readItem(item);
|
||||
item->setParent(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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user