[Uml-devel] KDE_3_4_BRANCH: kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Backport following fix from HEAD:
> CVS commit by okellogg:
> popupMenuSel(mt_Delete): UMLDoc::removeObject() may physically delete the
> object, hence call UMLCanvasObject::removeAllAssociations() beforehand.


  M +1 -1      umllistview.cpp   1.146.2.4


--- kdesdk/umbrello/umbrello/umllistview.cpp  #1.146.2.3:1.146.2.4
@@ -376,5 +376,4 @@ void UMLListView::popupMenuSel(int sel) 
                                 }
                         }
-                        m_doc->removeUMLObject(object);
                         UMLCanvasObject *canvasObj = dynamic_cast<UMLCanvasObject*>(object);
                         if (canvasObj) {
@@ -389,4 +388,5 @@ void UMLListView::popupMenuSel(int sel) 
                                 canvasObj->removeAllAssociations();
                         }
+                        m_doc->removeUMLObject(object);
                 } else {
                         kdWarning() << "umllistview::listpopupmenu::mt_Delete called with unknown type"