[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix bug 83430 (floatingtext with null string in XMI file causes problems.)


  M +7 -3      umlview.cpp   1.144


--- kdesdk/umbrello/umbrello/umlview.cpp  #1.143:1.144
@@ -3092,8 +3092,12 @@ bool UMLView::loadWidgetsFromXMI( QDomEl
         while( !widgetElement.isNull() ) {
                 widget = loadWidgetFromXMI(widgetElement);
-                if (!widget) {
-                        return false;
-                }
+                if (widget) {
                 m_WidgetList.append( widget );
+                // In the interest of best-effort loading, in case of a
+                // (widget == NULL) we still go on.
+                // The individual widget's loadFromXMI method should
+                // already have generated an error message to tell the
+                // user that something went wrong.
+                }
                 node = widgetElement.nextSibling();
                 widgetElement = node.toElement();