* Made OpenCursorcomplete virtual

 * Moved all stuff in DoInternalClose to CloseCursor

git-svn-id: trunk@6262 -

fcl/db/dataset.inc

@@ -189,6 +189,14 @@ end;
 Procedure TDataset.CloseCursor;
 
 begin
+  DoBeforeScroll;
+  DoBeforeClose;
+  FreeFieldBuffers;
+  ClearBuffers;
+  SetBufListSize(0);
+  SetState(dsInactive);
+  InternalClose;
+  DoAfterClose;
   FInternalOpenComplete := False;
 end;
 
@@ -393,19 +401,6 @@ begin
   FEOF := (FRecordcount = 0);
 end;
 
-Procedure TDataset.DoInternalClose;
-
-begin
-  DoBeforeScroll;
-  DoBeforeClose;
-  FreeFieldBuffers;
-  ClearBuffers;
-  SetBufListSize(0);
-  SetState(dsInactive);
-  InternalClose;
-  DoAfterClose;
-end;
-
 Procedure TDataset.DoOnCalcFields;
 
 begin
@@ -844,7 +839,7 @@ begin
       end;
     end
   else if not value and (Fstate <> dsinactive) then
-    DoInternalClose;
+    CloseCursor;
 end;
 
 procedure TDataset.Loaded;

fcl/db/db.pp

@@ -1000,7 +1000,6 @@ type
     FInternalOpenComplete: Boolean;
     Procedure DoInsertAppend(DoAppend : Boolean);
     Procedure DoInternalOpen;
-    Procedure DoInternalClose;
     Function  GetBuffer (Index : longint) : Pchar;
     Function  GetField (Index : Longint) : TField;
     Procedure RegisterDataSource(ADatasource : TDataSource);
@@ -1073,7 +1072,7 @@ type
     procedure InternalInsert; virtual;
     procedure InternalRefresh; virtual;
     procedure OpenCursor(InfoQuery: Boolean); virtual;
-    procedure OpenCursorcomplete;
+    procedure OpenCursorcomplete; virtual;
     procedure RefreshInternalCalcFields(Buffer: PChar); virtual;
     procedure RestoreState(const Value: TDataSetState);
     Procedure SetActive (Value : Boolean); virtual;