[Uml-devel] branches/work/soc-umbrello/umbrello/clipboard

[Andi Fischer]

SVN commit 1295258 by fischer:

Differences to trunk reduced.

 M  +1 -5      umldragdata.cpp  


--- branches/work/soc-umbrello/umbrello/clipboard/umldragdata.cpp #1295257:1295258
@@ -360,7 +360,6 @@
 bool UMLDragData::decodeClip2(const QMimeData* mimeData, UMLObjectList& objects,
                           UMLListViewItemList& umlListViewItems, UMLViewList& diagrams)
 {
-    Q_UNUSED(diagrams);
     if ( !mimeData->hasFormat("application/x-uml-clip2") ) {
         return false;
     }
@@ -435,13 +434,10 @@
             uError() << "Bad parent for view.";
             return false;
         }
-        // [PORT]
-#if 0
         UMLFolder *f = static_cast<UMLFolder*>(po);
         UMLView* view = new UMLView(f);
-        view->loadFromXMI(diagramElement);
+        view->umlScene()->loadFromXMI(diagramElement);
         diagrams.append(view);
-#endif
         diagramNode = diagramNode.nextSibling();
         diagramElement = diagramNode.toElement();
     }