[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 610682 by okellogg:

resolveRef(): Don't remove a whole package or folder from m_objects only
 because one of its leaf object's resolveRef() failed.
This is the hotfix.
TODO: Analyze which leaf object's resolveRef() failed, and why.
CCBUG:138344


 M  +3 -1      package.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/package.cpp #610681:610682
@@ -233,7 +233,9 @@
     for (UMLObjectListIt oit(m_objects); oit.current(); ++oit) {
         UMLObject *obj = oit.current();
         if (! obj->resolveRef()) {
-            m_objects.remove(obj);
+            Uml::Object_Type ot = obj->getBaseType();
+            if (ot != Uml::ot_Package && ot != Uml::ot_Folder)
+                m_objects.remove(obj);
             overallSuccess = false;
         }
     }