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

[Oliver Kellogg]

SVN commit 580119 by okellogg:

getFullyQualifiedName(): Skip Datatypes folder prefix when includeRoot is false.


 M  +9 -5      umlobject.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlobject.cpp #580118:580119
@@ -113,11 +113,15 @@
         bool skipPackage = false;
         if (!includeRoot) {
             UMLDoc *umldoc = UMLApp::app()->getDocument();
-            for (int i = 0; i < Uml::N_MODELTYPES; i++) {
-                const Uml::Model_Type mt = (Uml::Model_Type)i;
-                if (m_pUMLPackage == umldoc->getRootFolder(mt)) {
-                    skipPackage = true;
-                    break;
+            if (m_pUMLPackage == umldoc->getDatatypeFolder()) {
+                skipPackage = true;
+            } else {
+                for (int i = 0; i < Uml::N_MODELTYPES; i++) {
+                    const Uml::Model_Type mt = (Uml::Model_Type)i;
+                    if (m_pUMLPackage == umldoc->getRootFolder(mt)) {
+                        skipPackage = true;
+                        break;
+                    }
                 }
             }
         }