summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-07-24 11:27:47 +0200
committerEike Rathke <erack@redhat.com>2014-08-06 12:14:07 +0000
commit856bf05a1d8ce48ddc3038197b76123426be0daa (patch)
treedc43195a958c8ab12143bf349c674e07a061b0cb
parent1ff594ce98e9620578975decad1c6df382de82a4 (diff)
Related fdo#69006: Reintroduce some height calculation back.
When importing CSV with multiple lines in a cell, it looks as if some content was lost. It is not, it is in the spreadsheet, but looks very confusing, and only way to get around that was to let the heights be recalculated. It seems that the large CSV still opens in reasonable time even with this change in. Change-Id: I701110fcd8a92daa5f374d80f5af696666a7aa6a Reviewed-on: https://gerrit.libreoffice.org/10499 Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com>
-rw-r--r--sc/source/ui/docshell/impex.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 4b252823c549..033d73a18c3c 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1297,9 +1297,8 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
}
// Determine range for Undo.
- // TODO: we don't need this during import of a file to a new sheet or
- // document, could set bDetermineRange=false then.
- bool bDetermineRange = true;
+ // We don't need this during import of a file to a new sheet or document...
+ bool bDetermineRange = bUndo;
// Row heights don't need to be adjusted on the fly if EndPaste() is called
// afterwards, which happens only if bDetermineRange. This variable also