Browse Source

* patch from neli

git-svn-id: trunk@2442 -
marco 19 years ago
parent
commit
ac868ec7bf

+ 1 - 1
fcl/db/dbase/dbf.pas

@@ -1442,7 +1442,7 @@ begin
       FDbfFile.DbfVersion := TableLevelToDbfVersion(FTableLevel);
       FDbfFile.FileLangID := FLanguageID;
       FDbfFile.Open;
-      FDbfFile.FinishCreate(DbfFieldDefs, 512);
+      FDbfFile.FinishCreate(ADbfFieldDefs, 512);
 
       // if creating memory table, copy stream pointer
       if FStorage = stoMemory then

+ 1 - 1
fcl/db/dbase/dbf_common.pas

@@ -17,7 +17,7 @@ uses
 
 const
   TDBF_MAJOR_VERSION      = 6;
-  TDBF_MINOR_VERSION      = 47;
+  TDBF_MINOR_VERSION      = 48;
   TDBF_SUB_MINOR_VERSION  = 0;
 
   TDBF_TABLELEVEL_FOXPRO = 25;

+ 1 - 1
fcl/db/dbase/dbf_dbffile.pas

@@ -722,7 +722,7 @@ begin
 
     // update header
     PDbfHdr(Header)^.RecordSize := lFieldOffset;
-    PDbfHdr(Header)^.FullHdrSize := HeaderSize + RecordSize * FieldDefs.Count + 1;
+    PDbfHdr(Header)^.FullHdrSize := HeaderSize + RecordSize * AFieldDefs.Count + 1;
     // add empty "back-link" info, whatever it is: 
     { A 263-byte range that contains the backlink, which is the relative path of 
       an associated database (.dbc) file, information. If the first byte is 0x00, 

+ 2 - 2
fcl/db/dbase/dbf_idxfile.pas

@@ -944,8 +944,8 @@ begin
       PChar(keyData)^ := #0;
 {
   else
-    if Key <> nil then
-      PDouble(keyData)^ := PDouble(Key)^
+    if AKey <> nil then
+      PDouble(keyData)^ := PDouble(AKey)^
     else
       PDouble(keyData)^ := 0.0;
 }

+ 6 - 0
fcl/db/dbase/history.txt

@@ -32,6 +32,12 @@ BUGS & WARNINGS
 
 
 
+------------------------
+V6.4.8
+
+- remove duplicate names, may cause ambiguity
+
+
 ------------------------
 V6.4.7