Index: /trunk/src/VBox/Main/xml/Settings.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/Settings.cpp	(revision 37868)
+++ /trunk/src/VBox/Main/xml/Settings.cpp	(revision 37869)
@@ -838,5 +838,5 @@
             pcszVersion = "1.12";
             m->sv = SettingsVersion_v1_12;
-        break;
+            break;
 
         default:
@@ -844,5 +844,5 @@
             pcszVersion = "1.7";
             m->sv = SettingsVersion_v1_7;
-        break;
+            break;
     }
 
@@ -3467,9 +3467,9 @@
          switch (hw.firmwareType)
          {
-            case FirmwareType_EFI:      pcszFirmware = "EFI";   break;
-            case FirmwareType_EFI32:    pcszFirmware = "EFI32"; break;
-            case FirmwareType_EFI64:    pcszFirmware = "EFI64"; break;
+            case FirmwareType_EFI:      pcszFirmware = "EFI";     break;
+            case FirmwareType_EFI32:    pcszFirmware = "EFI32";   break;
+            case FirmwareType_EFI64:    pcszFirmware = "EFI64";   break;
             case FirmwareType_EFIDUAL:  pcszFirmware = "EFIDUAL"; break;
-            default:                    pcszFirmware = "None"; break;
+            default:                    pcszFirmware = "None";    break;
          }
          pelmFirmware->setAttribute("type", pcszFirmware);
@@ -3791,20 +3791,20 @@
                     if (nic.nat.strNetwork.length())
                         pelmNAT->setAttribute("network", nic.nat.strNetwork);
-                break;
+                    break;
 
                 case NetworkAttachmentType_Bridged:
                     pelmAdapter->createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName);
-                break;
+                    break;
 
                 case NetworkAttachmentType_Internal:
                     pelmAdapter->createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName);
-                break;
+                    break;
 
                 case NetworkAttachmentType_HostOnly:
                     pelmAdapter->createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName);
-                break;
+                    break;
 
                 default: /*case NetworkAttachmentType_Null:*/
-                break;
+                    break;
             }
         }
@@ -3895,5 +3895,6 @@
         case AudioControllerType_AC97:
         default:
-            pcszController = "AC97"; break;
+            pcszController = "AC97";
+            break;
     }
     pelmAudio->setAttribute("controller", pcszController);
@@ -4090,20 +4091,20 @@
                     pelmPF->setAttribute("guestport", (*rule).u16GuestPort);
             }
-        break;
+            break;
 
         case NetworkAttachmentType_Bridged:
             if (fEnabled || !nic.strBridgedName.isEmpty())
                 elmParent.createChild("BridgedInterface")->setAttribute("name", nic.strBridgedName);
-        break;
+            break;
 
         case NetworkAttachmentType_Internal:
             if (fEnabled || !nic.strInternalNetworkName.isEmpty())
                 elmParent.createChild("InternalNetwork")->setAttribute("name", nic.strInternalNetworkName);
-        break;
+            break;
 
         case NetworkAttachmentType_HostOnly:
             if (fEnabled || !nic.strHostOnlyName.isEmpty())
                 elmParent.createChild("HostOnlyInterface")->setAttribute("name", nic.strHostOnlyName);
-        break;
+            break;
 
         case NetworkAttachmentType_Generic:
@@ -4121,8 +4122,8 @@
                 }
             }
-        break;
+            break;
 
         default: /*case NetworkAttachmentType_Null:*/
-        break;
+            break;
     }
 }
@@ -4235,5 +4236,5 @@
                     if (att.fNonRotational)
                         pelmDevice->setAttribute("nonrotational", att.fNonRotational);
-                break;
+                    break;
 
                 case DeviceType_DVD:
@@ -4242,9 +4243,9 @@
                     if (att.fTempEject)
                         pelmDevice->setAttribute("tempeject", att.fTempEject);
-                break;
+                    break;
 
                 case DeviceType_Floppy:
                     pcszType = "Floppy";
-                break;
+                    break;
             }
 
Index: /trunk/src/VBox/Main/xml/ovfreader.cpp
===================================================================
--- /trunk/src/VBox/Main/xml/ovfreader.cpp	(revision 37868)
+++ /trunk/src/VBox/Main/xml/ovfreader.cpp	(revision 37869)
@@ -508,5 +508,5 @@
                                                 UINT16_MAX,
                                                 i.ulLineNumber);
-                    break;
+                        break;
 
                     case ResourceType_Memory:        // 4
@@ -521,5 +521,5 @@
                                                 i.strAllocationUnits.c_str(),
                                                 i.ulLineNumber);
-                    break;
+                        break;
 
                     case ResourceType_IDEController:          // 5
@@ -570,6 +570,6 @@
                         if (!pPrimaryIDEController)
                             pPrimaryIDEController = &vsys.mapControllers[i.ulInstanceID];
+                        break;
                     }
-                    break;
 
                     case ResourceType_ParallelSCSIHBA:        // 6       SCSI controller
@@ -589,6 +589,6 @@
 
                         vsys.mapControllers[i.ulInstanceID] = hdc;
+                        break;
                     }
-                    break;
 
                     case ResourceType_EthernetAdapter: // 10
@@ -615,10 +615,10 @@
                         ea.strNetworkName = i.strConnection;
                         vsys.llEthernetAdapters.push_back(ea);
+                        break;
                     }
-                    break;
 
                     case ResourceType_FloppyDrive: // 14
                         vsys.fHasFloppyDrive = true;           // we have no additional information
-                    break;
+                        break;
 
                     case ResourceType_CDDrive:       // 15
@@ -635,9 +635,9 @@
                             // VMware can't export ISOs, then we don't need to be able to import them right now.
                         vsys.fHasCdromDrive = true;           // we have no additional information
-                    break;
+                        break;
 
                     case ResourceType_HardDisk: // 17
                         // handled separately in second loop below
-                    break;
+                        break;
 
                     case ResourceType_OtherStorageDevice:        // 20       SATA controller
@@ -668,6 +668,6 @@
                                                 ResourceType_OtherStorageDevice,
                                                 i.ulLineNumber);
+                        break;
                     }
-                    break;
 
                     case ResourceType_USBController: // 23
@@ -681,5 +681,5 @@
                             </Item> */
                         vsys.fHasUsbController = true;           // we have no additional information
-                    break;
+                        break;
 
                     case ResourceType_SoundCard: // 35
@@ -694,5 +694,5 @@
                             </Item> */
                         vsys.strSoundCardType = i.strResourceSubType;
-                    break;
+                        break;
 
                     default:
@@ -767,7 +767,8 @@
 
                         vsys.mapVirtualDisks[vd.strDiskId] = vd;
+                        break;
                     }
-                    break;
-                    default: break;
+                    default:
+                        break;
                 }
             }