workaround problems with row import, fdo#58539

This fixes another crash with gnome#627150

Change-Id: Ibd259c77f8df04b52c9fee0699e0edd1ad30e94e

sc/source/filter/xml/xmlrowi.cxx

@@ -97,6 +97,7 @@ ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport,
             break;*/
         }
     }
+    mnLastRow = GetScImport().GetTables().GetCurrentRow() + nRepeatedRows;
     GetScImport().GetTables().AddRow();
     GetScImport().GetTables().SetRowStyle(sCellStyleName);
 }
@@ -154,6 +155,12 @@ void ScXMLTableRowContext::EndElement()
     }
     SCTAB nSheet = rXMLImport.GetTables().GetCurrentSheet();
     sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow());
+    if(nCurrentRow != mnLastRow)
+    {
+        // this document is most likely invalid in some way
+        SAL_WARN("sc", "we did not generate enough rows in the cell import!!");
+        nCurrentRow = mnLastRow;
+    }
     uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet());
     if(xSheet.is())
     {

sc/source/filter/xml/xmlrowi.hxx

@@ -29,6 +29,8 @@ class ScXMLTableRowContext : public SvXMLImportContext
     rtl::OUString sStyleName;
     rtl::OUString sVisibility;
     sal_Int32 nRepeatedRows;
+    sal_Int32 mnLastRow; // to workaround problems with the cell import, can be removed when the cell
+                        // always adds enough rows
     bool bHasCell;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }