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

[Oliver Kellogg]

SVN commit 454023 by okellogg:

findUMLObject(): Add missing consideration of currentObj's namespace proper.


 M  +5 -4      model_utils.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #454022:454023
@@ -1,5 +1,5 @@
 /*
- *  copyright (C) 2004
+ *  copyright (C) 2004-2005
  *  Umbrello UML Modeller Authors <uml-devel@ uml.sf.net>
  */
 
@@ -126,10 +126,11 @@
     if (currentObj) {
         UMLPackage *pkg = NULL;
         if (dynamic_cast<UMLClassifierListItem*>(currentObj)) {
-            pkg = dynamic_cast<UMLPackage*>(currentObj->parent());
-        } else {
+            currentObj = static_cast<UMLObject*>(currentObj->parent());
+        }
+        pkg = dynamic_cast<UMLPackage*>(currentObj);
+        if (pkg == NULL)
             pkg = currentObj->getUMLPackage();
-        }
         // Remember packages that we've seen - for avoiding cycles.
         UMLPackageList seenPkgs;
         for (; pkg; pkg = currentObj->getUMLPackage()) {