pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix crash of db_import_export demo in virtual mode.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5993 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-08-09 22:52:49 +00:00
parent 6723411283
commit 96ffaaa4d2
14 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/fpspreadsheet/examples/db_import_export/main.lfm
View File

@@ -8,7 +8,7 @@ object Form1: TForm1
ClientWidth = 521
OnCreate = FormCreate
OnDestroy = FormDestroy
LCLVersion = '1.7'
LCLVersion = '1.9.0.0'
object PageControl: TPageControl
Left = 4
Height = 302
@@ -274,7 +274,6 @@ object Form1: TForm1
Anchors = [akTop, akLeft, akBottom]
ItemHeight = 0
OnClick = FileListClick
Options = [lboDrawFocusRect]
TabOrder = 1
end
object Label3: TLabel

5
components/fpspreadsheet/examples/db_import_export/main.pas
View File

@@ -514,6 +514,7 @@ begin
FWorkbook := TsWorkbook.Create;
try
FWorkbook.FormatSettings.ShortDateFormat := 'dd.mm.yyyy "r."';
worksheet := FWorkbook.AddWorksheet(tableName);
// Make header line frozen - but not in Excel2 where frozen panes do not yet work properly
@@ -614,7 +615,7 @@ begin
cctNumber : if IsCurrencyFormat(nfp) then fieldType := ftCurrency
else fieldType := ftFloat;
cctDateTime : fieldType := ftDateTime;
cctUTF8String : fieldType := ftString;
else fieldType := ftString;
end;
FImportDataset.FieldDefs.Add(FImportedFieldNames[i], fieldType);
end;
@@ -629,7 +630,7 @@ begin
case FImportedRowCells[i].ContentType of
cctNumber : FImportDataset.Fields[i].AsFloat := FImportedRowCells[i].NumberValue;
cctDateTime : FImportDataset.Fields[i].AsDateTime := FImportedRowCells[i].DateTimeValue;
cctUTF8String: FImportDataset.Fields[i].AsString := FImportedRowCells[i].UTF8StringValue;
else FImportDataset.Fields[i].AsString := FImportedRowCells[i].UTF8StringValue;
end;
FImportDataset.Post;
// Finally we dispose the buffered cells, we don't need them any more