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

[Oliver Kellogg]

SVN commit 634394 by okellogg:

setName(): Remove special-casing code for when m_pName is non-NULL but strName
 is empty. This is a sensitive spot so I put the offending code in a comment
 for documentation.
BUG:141813


 M  +1 -0      ChangeLog  
 M  +2 -0      umbrello/associationwidget.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #634393:634394
@@ -7,6 +7,7 @@
 * Javascript Code Generation creates bad format methods (135540)
 * Crash when deleting the link between a package and a class (141602)
 * Ada95 Code Generation Errors for Aggregation (141644)
+* Unable to delete multiplicity information or lable from an association (141813)
 
 Version 1.5.61
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.cpp #634393:634394
@@ -327,11 +327,13 @@
             m_pName->setUMLObject(m_role[B].m_pWidget->getUMLObject());
     } else {
         m_pName->setText(strName);
+        /**** This code leads to bug 141813 (unable to delete label or multi)
         if (strName.isEmpty()) {
             m_pName->hide();
             m_pName = NULL;
             return;
         }
+         ********************************************************************/
     }
 
     // set attribute of UMLAssociation associated with this associationwidget