--- Merging r20941 into '.':

C    packages/fcl-db/src/base/bufdataset.pas
Summary of conflicts:
  Text conflicts: 1

# revisions: 20941
r20941 | joost | 2012-04-20 16:02:41 +0200 (Fri, 20 Apr 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-db/src/base/bufdataset.pas

 * Better fix for r20940 based on patch from Marcelo B Paula, bug #17813

git-svn-id: branches/fixes_2_6@22442 -

packages/fcl-db/src/base/bufdataset.pas

@@ -498,7 +498,6 @@ type
     procedure BeforeRefreshOpenCursor; virtual;
     procedure DoFilterRecord(out Acceptable: Boolean); virtual;
     procedure SetReadOnly(AValue: Boolean); virtual;
-    procedure CreateFieldDefs; virtual;
   {abstracts, must be overidden by descendents}
     function Fetch : boolean; virtual;
     function LoadField(FieldDef : TFieldDef;buffer : pointer; out CreateBlob : boolean) : boolean; virtual;
@@ -2723,7 +2722,7 @@ begin
     end
   else if (fields.Count>0) then
     begin
-    CreateFieldDefs;
+    InitFieldDefsFromfields;
     BindFields(True);
     Open;
     end
@@ -2914,17 +2913,6 @@ begin
     Acceptable := Boolean((FParser.ExtractFromBuffer(GetCurrentBuffer))^);
 end;
 
-procedure TCustomBufDataset.CreateFieldDefs;
-
-Var
-  I : longint;
-  FieldDef: TFieldDef;
-begin
-  For I:=0 to FieldCount-1 do
-    with Fields.Fields[I] do if FieldKind=fkData then
-      FieldDefs.Add(FieldName,DataType,Size,Required);
-end;
-
 procedure TCustomBufDataset.SetFilterText(const Value: String);
 begin
   if Value = Filter then