[Uml-devel] branches/KDE/4.7/kdesdk/umbrello/umbrello/codeimport

[Ralf Habacker]

SVN commit 1266792 by habacker:

backported from trunk r1266790: crash fix on importing idl file


 M  +4 -2      idlimport.cpp  


--- branches/KDE/4.7/kdesdk/umbrello/umbrello/codeimport/idlimport.cpp #1266791:1266792
@@ -180,13 +180,14 @@
         const QString& name = advance();
         UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class,
                         name, m_scope[m_scopeIndex], m_comment);
-        m_scope[++m_scopeIndex] = m_klass = static_cast<UMLClassifier*>(ns);
+        m_klass = static_cast<UMLClassifier*>(ns);
         m_klass->setStereotype("CORBAInterface");
         m_klass->setAbstract(m_isAbstract);
         m_isAbstract = false;
         m_comment.clear();
         if (advance() == ";")   // forward declaration
             return true;
+        m_scope[++m_scopeIndex] = m_klass;
         if (m_source[m_srcIndex] == ":") {
             while (++m_srcIndex < srcLength && m_source[m_srcIndex] != "{") {
                 const QString& baseName = m_source[m_srcIndex];
@@ -259,11 +260,12 @@
         const QString& name = advance();
         UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class,
                         name, m_scope[m_scopeIndex], m_comment);
-        m_scope[++m_scopeIndex] = m_klass = static_cast<UMLClassifier*>(ns);
+        m_klass = static_cast<UMLClassifier*>(ns);
         m_klass->setAbstract(m_isAbstract);
         m_isAbstract = false;
         if (advance() == ";")   // forward declaration
             return true;
+        m_scope[++m_scopeIndex] = m_klass;
         if (m_source[m_srcIndex] == ":") {
             if (advance() == "truncatable")
                 m_srcIndex++;