Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

ChangeLog

@@ -14,6 +14,7 @@ not set
 - bug #3964 Import using https does not work
 - bug Missing removeCRLF option in ExportCsv and ExportExcel plugins
 - bug #3631 Drop not working Visio schema export.
+- bug #3645 Better handling of invalid ODS documents
 
 4.0.3.0 (2013-06-05)
 - bug #3941 Recent tables list always empty

libraries/plugins/import/ImportOds.class.php

@@ -175,8 +175,16 @@ class ImportOds extends ImportPlugin
             );
             $error = true;
         } else {
-            $sheets = $xml->children('office', true)->{'body'}->{'spreadsheet'}
-                ->children('table', true);
+            $root = $xml->children('office', true)->{'body'}->{'spreadsheet'};
+            if (empty($root)) {
+                $sheets = array();
+                $message = PMA_Message::error(
+                    __('Could not parse OpenDocument Spreasheet!')
+                );
+                $error = true;
+            } else {
+                $sheets = $root->children('table', true);
+            }
         }
 
         $tables = array();