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

[Oliver Kellogg]

SVN commit 647978 by okellogg:

initFields(): Move invocation of  CodeGenFactory::newDeclarationCodeBlock() to
 finishInitialization(). If inConstructor is true then no dispatching to the
 CPPCodeClassField takes place.
BUG:126262


 M  +1 -0      ChangeLog  
 M  +2 -1      umbrello/codeclassfield.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #647977:647978
@@ -10,6 +10,7 @@
 * Operations of the Interface are not implemented in the class automatically
   (111593)
 * Relationships for entities do not live outside of the diagram (125146)
+* Crashes while loading file (Advanced Code Generators enabled) (126262)
 * Multiplicity labels often are placed incorrectly (127628)
 * Crash on adding operation to class with Advanced Code Generators enabled
   (131528)
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codeclassfield.cpp #647977:647978
@@ -595,7 +595,7 @@
 
     m_writeOutMethods = false;
     m_listClassName = QString ("");
-    m_declCodeBlock = CodeGenFactory::newDeclarationCodeBlock(getParentDocument(), this);
+    m_declCodeBlock = NULL;
 
     m_methodVector.setAutoDelete(false);
     // m_methodMap = new QMap<CodeAccessorMethod::AccessorType, CodeAccessorMethod *>;
@@ -605,6 +605,7 @@
 }
 
 void CodeClassField::finishInitialization() {
+    m_declCodeBlock = CodeGenFactory::newDeclarationCodeBlock(getParentDocument(), this);
     initAccessorMethods();
     updateContent();