Changeset 78210 in vbox

Timestamp:

Apr 18, 2019 4:08:51 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9434: Import Appliance wizard: Form Editor widget: Small protection against a try to apply empty choice; a bit of cleanup as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIFormEditorWidget.cpp

@@ -168 +168 @@
     void setChoice(const ChoiceData &choice);
 
+    /** Updates value cells. */
+    void updateValueCells();
+
 protected:
 
@@ -181 +184 @@
     /** Cleanups all. */
     void cleanup();
-
-    /** Updates value cells. */
-    void updateValueCells();
 
     /** Holds the row value. */
@@ -369 +369 @@
 void UIFormEditorRow::setChoice(const ChoiceData &choice)
 {
+    /* Do nothing for empty choices: */
+    if (choice.selectedChoice() == -1)
+        return;
+
     AssertReturnVoid(valueType() == KFormValueType_Choice);
     CChoiceFormValue comValue(m_comValue);
@@ -387 +391 @@
         else
             updateValueCells();
+    }
+}
+
+void UIFormEditorRow::updateValueCells()
+{
+    switch (m_enmValueType)
+    {
+        case KFormValueType_Boolean:
+        {
+            CBooleanFormValue comValue(m_comValue);
+            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetSelected() ? "True" : "False");
+            /// @todo check for errors
+            break;
+        }
+        case KFormValueType_String:
+        {
+            CStringFormValue comValue(m_comValue);
+            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetString());
+            /// @todo check for errors
+            break;
+        }
+        case KFormValueType_Choice:
+        {
+            CChoiceFormValue comValue(m_comValue);
+            const QVector<QString> values = comValue.GetValues();
+            m_cells[UIFormEditorDataType_Value]->setText(values.at(comValue.GetSelectedIndex()));
+            /// @todo check for errors
+            break;
+        }
+        default:
+            break;
     }
 }
@@ -424 +459 @@
     qDeleteAll(m_cells);
     m_cells.clear();
-}
-
-void UIFormEditorRow::updateValueCells()
-{
-    switch (m_enmValueType)
-    {
-        case KFormValueType_Boolean:
-        {
-            CBooleanFormValue comValue(m_comValue);
-            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetSelected() ? "True" : "False");
-            /// @todo check for errors
-            break;
-        }
-        case KFormValueType_String:
-        {
-            CStringFormValue comValue(m_comValue);
-            m_cells[UIFormEditorDataType_Value]->setText(comValue.GetString());
-            /// @todo check for errors
-            break;
-        }
-        case KFormValueType_Choice:
-        {
-            CChoiceFormValue comValue(m_comValue);
-            const QVector<QString> values = comValue.GetValues();
-            m_cells[UIFormEditorDataType_Value]->setText(values.at(comValue.GetSelectedIndex()));
-            /// @todo check for errors
-            break;
-        }
-        default:
-            break;
-    }
 }