diff options
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/inc/impex.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index df74149d8f76..025737f86fef 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -234,9 +234,9 @@ bool ScImportExport::StartPaste() // 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() ); if( pUndoDoc && pDoc->IsUndoEnabled() ) @@ -1470,7 +1470,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) nRow = nStartRow; if (!StartPaste()) { - EndPaste(); + EndPaste(false); return false; } } @@ -1481,7 +1481,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) xProgress.reset(); // make room for AdjustRowHeight progress if (bRangeIsDetermined) - EndPaste(); + EndPaste(false); return true; } diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 0535c94aa4a6..43561540d662 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -70,7 +70,7 @@ class ScImportExport ScAsciiOptions* pExtOptions; // extended options 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 Text2Doc( SvStream& ); bool Doc2Sylk( SvStream& ); |