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

[Oliver Kellogg]

SVN commit 601508 by okellogg:

load(): We forgot to exclude ot_Template from the UMLPackage::addObject().
http://www.geeksoc.org/~jr/umbrello/uml-devel/9816.html


 M  +4 -0      ChangeLog  
 M  +2 -2      umbrello/umlobject.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #601507:601508
@@ -1,5 +1,9 @@
 Version 1.5.52
 
+* Fixed segfault in UMLClassifier::checkOperationSignature()
+  (http://www.geeksoc.org/~jr/umbrello/uml-devel/9816.html)
+* Fixed segfault on XMI close when a class uses a template
+  (http://www.geeksoc.org/~jr/umbrello/uml-devel/9818.html)
 * Bugs/wishes from http://bugs.kde.org:
 * Shift + Left and Shift+Right causes SIGSEGV (136288)
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlobject.cpp #601507:601508
@@ -727,11 +727,11 @@
         }
     }
 
-    // Operations, attributes, enum literals, stereotypes, associations,
+    // Operations, attributes, enum literals, templates, stereotypes, associations,
     // and association role objects get added and signaled elsewhere.
     if (m_BaseType != Uml::ot_Operation && m_BaseType != Uml::ot_Attribute &&
             m_BaseType != Uml::ot_EnumLiteral && m_BaseType != Uml::ot_EntityAttribute &&
-            m_BaseType != Uml::ot_Stereotype &&
+            m_BaseType != Uml::ot_Template && m_BaseType != Uml::ot_Stereotype &&
             m_BaseType != Uml::ot_Association && m_BaseType != Uml::ot_Role) {
         if (m_bInPaste) {
             m_pUMLPackage = NULL;  // forget any old parent