Kaydet (Commit) 89d7363b authored tarafından Markus Mohrhard's avatar Markus Mohrhard

don't update row height for csv import, fdo#69009

Multiline cells are already updated and we can skip the other cells.

Change-Id: I6690beeaad01543c12cb42247baec6fbc18aaa77
üst e7f3330c
...@@ -234,9 +234,9 @@ bool ScImportExport::StartPaste() ...@@ -234,9 +234,9 @@ bool ScImportExport::StartPaste()
// Nachbereitung Insert: Undo/Redo-Aktionen erzeugen, Invalidate/Repaint // Nachbereitung Insert: Undo/Redo-Aktionen erzeugen, Invalidate/Repaint
void ScImportExport::EndPaste() void ScImportExport::EndPaste(bool bAutoRowHeight)
{ {
bool bHeight = pDocSh && pDocSh->AdjustRowHeight( bool bHeight = bAutoRowHeight && pDocSh && pDocSh->AdjustRowHeight(
aRange.aStart.Row(), aRange.aEnd.Row(), aRange.aStart.Tab() ); aRange.aStart.Row(), aRange.aEnd.Row(), aRange.aStart.Tab() );
if( pUndoDoc && pDoc->IsUndoEnabled() ) if( pUndoDoc && pDoc->IsUndoEnabled() )
...@@ -1470,7 +1470,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ...@@ -1470,7 +1470,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
nRow = nStartRow; nRow = nStartRow;
if (!StartPaste()) if (!StartPaste())
{ {
EndPaste(); EndPaste(false);
return false; return false;
} }
} }
...@@ -1481,7 +1481,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) ...@@ -1481,7 +1481,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
xProgress.reset(); // make room for AdjustRowHeight progress xProgress.reset(); // make room for AdjustRowHeight progress
if (bRangeIsDetermined) if (bRangeIsDetermined)
EndPaste(); EndPaste(false);
return true; return true;
} }
......
...@@ -70,7 +70,7 @@ class ScImportExport ...@@ -70,7 +70,7 @@ class ScImportExport
ScAsciiOptions* pExtOptions; // extended options ScAsciiOptions* pExtOptions; // extended options
bool StartPaste(); // Protect check, set up Undo bool StartPaste(); // Protect check, set up Undo
void EndPaste(); // Undo/Redo actions, Repaint void EndPaste(bool bAutoRowHeight = true); // Undo/Redo actions, Repaint
bool Doc2Text( SvStream& ); bool Doc2Text( SvStream& );
bool Text2Doc( SvStream& ); bool Text2Doc( SvStream& );
bool Doc2Sylk( SvStream& ); bool Doc2Sylk( SvStream& );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment