[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

loadFromXMI(): Avoid duplicated listview items on loading older Umbrello files.


  M +3 -1      umldoc.cpp   1.239


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.238:1.239
@@ -2074,5 +2074,4 @@ bool UMLDoc::loadFromXMI( QIODevice & fi
                         recognized = true;
                 } else if (outerTag == "XMI.extensions") {
-                        resolveTypes();
                         QDomNode extensionsNode = node.firstChild();
                         while (! extensionsNode.isNull()) {
@@ -2377,4 +2376,7 @@ void UMLDoc::loadExtensionsFromXMI(QDomN
 
         } else if (tag == "listview") {
+                //FIXME: Need to resolveTypes() before loading listview,
+                //       else listview items are duplicated.
+                resolveTypes();
                 if( !UMLApp::app()->getListView() -> loadFromXMI( element ) ) {
                         kdWarning() << "failed load on listview" << endl;