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

[Oliver Kellogg]

SVN commit 439865 by okellogg:

CCBUG:72016 - It turns out that the bug was not completely fixed;
the reoccurrence is fixed by the change below.
Unfortunately this checkin did not make it into version 1.4.2.

SVN commit 439023 by okellogg:

Backport commit #439013 from trunk:
> loadFromXMI(): use setUMLObject() so that the attributeRemoved signal gets connected.


 M  +1 -1      associationwidget.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.cpp #439022:439023
@@ -3323,7 +3323,7 @@
         } else {
             const Uml::Object_Type ot = myObj->getBaseType();
             if (ot == ot_Attribute || ot == ot_Operation) {
-                m_pObject = myObj;
+                setUMLObject(myObj);
                 QString type = qElement.attribute( "type", "-1" );
                 Uml::Association_Type aType = (Uml::Association_Type) type.toInt();
                 setAssocType(aType);



 M  +2 -2      ChangeLog  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #439864:439865
@@ -6,12 +6,12 @@
 * Change interface into class and vice versa (if abstract and no attributes)
 
 * Bugs fixed / wishes implemented (see http://bugs.kde.org)
-57588 67719 79433 87252 88117 97162 105564 108223 109591
+57588 67719 72016 79433 87252 88117 97162 105564 108223 109591
 
 Version 1.4.2 (maintenance release)
 
 * Bugs fixed from http://bugs.kde.org :
-72016 97188 103170 106183 106356 106632 106673 107101 107551 108688
+97188 103170 106183 106356 106632 106673 107101 107551 108688
 
 Version 1.4.1 (maintenance release)