tdf#161986 speedup ODS with large merged range

reduces load time from 90s to 25s

Change-Id: I7523776e5f4e2c4dc8645ccdf303e51178a9848a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174376
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins

3 files changed, 13 insertions, 0 deletions

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 0de47dcfbe5e..911586eb2683 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1269,6 +1269,13 @@ void ScXMLTableRowCellContext::AddTextAndValueCell( const ScAddress& rCellPos,
                     rTables.AddColumn(false);
                 }
             }
+            // if nothing else useful can happen in the loop, just exit early
+            if (i != 0 && bIsEmpty && rCurrentPos.Row() != 0)
+            {
+                rCurrentPos.SetCol( rCellPos.Col() + nColsRepeated - 1 );
+                rTables.AddColumns(nColsRepeated - i - 1);
+                break;
+            }
         }
     }
 }
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index aa48f37833b3..0d865721b930 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -179,6 +179,11 @@ void ScMyTables::AddColumn(bool bIsCovered)
         rImport.GetStylesImportHelper()->InsertCol(maCurrentCellPos.Col(), maCurrentCellPos.Tab());
 }
 
+void ScMyTables::AddColumns(sal_Int32 nRepeat)
+{
+    maCurrentCellPos.SetCol( maCurrentCellPos.Col() + nRepeat );
+}
+
 void ScMyTables::DeleteTable()
 {
     ScXMLImport::MutexGuard aGuard(rImport);
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index b0c6e7457224..49e148b3db16 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -73,6 +73,7 @@ public:
     void                                AddRow();
     void                                SetRowStyle(const OUString& rCellStyleName);
     void                                AddColumn(bool bIsCovered);
+    void                                AddColumns(sal_Int32 nRepeat);
     void                                FixupOLEs() { aFixupOLEs.FixupOLEs(); }
     static bool                         IsOLE(const css::uno::Reference< css::drawing::XShape >& rShape)
                                             { return ScMyOLEFixer::IsOLE(rShape); }