View | Details | Raw Unified | Return to issue 15509
Collapse All | Expand All

(-)sc/source/ui/docshell/impex.cxx (+13 lines)
Lines 1-3 Link Here
Lines 1044-1049 BOOL ScImportExport::ExtText2Doc( SvStre Link Here
1044
	if (!pExtOptions)
1048
	if (!pExtOptions)
1045
		return Text2Doc( rStrm );
1049
		return Text2Doc( rStrm );
1046
1050
1051
	if( !StartPaste() )
1052
	{
1053
		EndPaste();
1054
		return FALSE;
1055
	}
1056
1047
	ULONG nOldPos = rStrm.Tell();
1057
	ULONG nOldPos = rStrm.Tell();
1048
	rStrm.Seek( STREAM_SEEK_TO_END );
1058
	rStrm.Seek( STREAM_SEEK_TO_END );
1049
	ScProgress aProgress( pDocSh, ScGlobal::GetRscString( STR_LOAD_DOC ), rStrm.Tell() - nOldPos );
1059
	ScProgress aProgress( pDocSh, ScGlobal::GetRscString( STR_LOAD_DOC ), rStrm.Tell() - nOldPos );
Lines 1056-1061 BOOL ScImportExport::ExtText2Doc( SvStre Link Here
1056
1066
1057
	DBG_ASSERT( !bUndo, "ExtText2Doc mit Undo noch nicht implementiert!" );
1067
	DBG_ASSERT( !bUndo, "ExtText2Doc mit Undo noch nicht implementiert!" );
1058
	SCCOL nStartCol = aRange.aStart.Col();
1068
	SCCOL nStartCol = aRange.aStart.Col();
1069
	SCCOL nMaxCol = aRange.aEnd.Col();
1059
	SCROW nStartRow = aRange.aStart.Row();
1070
	SCROW nStartRow = aRange.aStart.Row();
1060
	SCTAB nTab = aRange.aStart.Tab();
1071
	SCTAB nTab = aRange.aStart.Tab();
1061
1072
Lines 1154-1159 BOOL ScImportExport::ExtText2Doc( SvStre Link Here
1154
				++nSourceCol;
1165
				++nSourceCol;
1155
			}
1166
			}
1156
		}
1167
		}
1168
		if (nCol > nMaxCol)
1169
			nMaxCol = nCol;
1170
1157
        if (bMultiLine && pDocSh)
1171
        if (bMultiLine && pDocSh)
1158
            pDocSh->AdjustRowHeight( nRow, nRow, nTab);
1172
            pDocSh->AdjustRowHeight( nRow, nRow, nTab);
1159
1173
Lines 1172-1177 BOOL ScImportExport::ExtText2Doc( SvStre Link Here
1172
    delete pEnglishTransliteration;
1186
    delete pEnglishTransliteration;
1173
	delete pEnglishCalendar;
1187
	delete pEnglishCalendar;
1174
1188
1189
	aRange.aEnd = ScAddress( nMaxCol, nRow, aRange.aStart.Tab() );
1190
	EndPaste();
1191
1175
	return TRUE;
1192
	return TRUE;
1176
}
1193
}
1177
1194

Return to issue 15509