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

[Oliver Kellogg]

SVN commit 682501 by okellogg:

resolveRef(): Fixes for loading Rose models.
- Remove gratuitous clobbering of m_SecondaryFallback
- Supply the m_pUMLPackage at call to Import_Utils::createUMLObject()


 M  +1 -2      umlobject.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #682500:682501
@@ -443,7 +443,6 @@
             m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, "undef", datatypes, false);
             return true;
         }
-        m_SecondaryFallback = m_SecondaryId;
     }
     if (m_SecondaryFallback.isEmpty()) {
         kError() << "UMLObject::resolveRef(" << m_Name
@@ -471,7 +470,7 @@
     // of on-the-fly scope creation:
     if (m_SecondaryId.contains("::")) {
         // TODO: Merge Import_Utils::createUMLObject() into Object_Factory::createUMLObject()
-        m_pSecondary = Import_Utils::createUMLObject(Uml::ot_UMLObject, m_SecondaryId, NULL);
+        m_pSecondary = Import_Utils::createUMLObject(Uml::ot_UMLObject, m_SecondaryId, m_pUMLPackage);
         if (m_pSecondary) {
             if (Import_Utils::newUMLObjectWasCreated()) {
                 maybeSignalObjectCreated();