Commit 50f5d4eb authored by Joris Steyn's avatar Joris Steyn

Include association objects in clip4 and load them

BUG: 327834
FIXED-IN: 4.12.0
parent 80c49511
......@@ -97,6 +97,12 @@ QMimeData* UMLClipboard::copy(bool fromView/*=false*/)
m_ObjectList.append(widget->umlObject());
}
}
foreach (WidgetBase* widget, m_AssociationList) {
if (widget->umlObject() != 0) {
m_ObjectList.append(widget->umlObject());
}
}
} else { //if the copy action is being performed from the ListView
UMLListViewItemList itemsSelected = listView->selectedItems();
if (itemsSelected.count() <= 0) {
......
......@@ -640,9 +640,6 @@ bool UMLDragData::decodeClip4(const QMimeData* mimeData, UMLObjectList& objects,
while (!element.isNull()) {
UMLObject* pObject = 0;
QString type = element.tagName();
//FIXME associations don't load
if (type == "UML:Association")
continue;
UMLDoc* doc = UMLApp::app()->document();
Uml::ID::Type elmId = Uml::ID::fromString(element.attribute("xmi.id"));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment