[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 667186 by okellogg:

apply r667185 from branches/KDE/3.5/kdesdk

 M  +6 -0      ChangeLog  
 M  +12 -7     umbrello/umlobject.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #667185:667186
@@ -1,3 +1,9 @@
+Version 1.5.71
+
+* Bugs/wishes from http://bugs.kde.org:
+* Unstable saves and loads, class names become dirty (145709)
+* Crash on deleting class in list view (145762)
+
 Version 1.5.7
 
 * Bugs/wishes from http://bugs.kde.org:
--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #667185:667186
@@ -436,16 +436,21 @@
             maybeSignalObjectCreated();
             return true;
         }
-    }
-    if (m_SecondaryFallback.isEmpty()) {
-        if (m_SecondaryId.isEmpty()) {
-            kError() << "UMLObject::resolveRef(" << m_Name
-                << "): both m_SecondaryId and m_SecondaryFallback are empty"
-                << endl;
-            return false;
+        if (m_SecondaryFallback.isEmpty()) {
+            kDebug() << "UMLObject::resolveRef: object with xmi.id=" << m_SecondaryId
+                << " not found, setting to undef" << endl;
+            UMLFolder *datatypes = pDoc->getDatatypeFolder();
+            m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, "undef", datatypes, false);
+            return true;
         }
         m_SecondaryFallback = m_SecondaryId;
     }
+    if (m_SecondaryFallback.isEmpty()) {
+        kError() << "UMLObject::resolveRef(" << m_Name
+            << "): cannot find type with id "
+            << m_SecondaryId << endl;
+        return false;
+    }
 #ifdef VERBOSE_DEBUGGING
     kDebug() << "UMLObject::resolveRef(" << m_Name
               << "): could not resolve secondary ID " << m_SecondaryId