* Undid contested TBookmarkStr -> TBookMark change

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

packages/fcl-db/src/base/dataset.inc

@@ -1582,7 +1582,7 @@ Procedure TDataset.DoInsertAppend(DoAppend : Boolean);
 
   procedure DoInsert(DoAppend : Boolean);
 
-  Var BookBeforeInsert : TBookmark;
+  Var BookBeforeInsert : TBookmarkStr;
       TempBuf : pointer;
 
   begin
@@ -1624,10 +1624,7 @@ Procedure TDataset.DoInsertAppend(DoAppend : Boolean);
     // 1-apr-06, JvdS: It just sets the bookmark of the newly inserted record to the place
     // where the record should be inserted. So it is ok.
     if FRecordcount > 0 then
-      begin
       SetBookMarkData(ActiveBuffer,pointer(BookBeforeInsert));
-      FreeBookmark(BookBeforeInsert);
-      end;
     end;
 
   InternalInsert;

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

@@ -1614,7 +1614,7 @@ type
     function UpdateStatus: TUpdateStatus; virtual;
     property BlockReadSize: Integer read FBlockReadSize write SetBlockReadSize;
     property BOF: Boolean read FBOF;
-    property Bookmark: TBookmark read GetBookmark write GotoBookmark;
+    property Bookmark: TBookmarkStr read GetBookmarkStr write SetBookmarkStr;
     property CanModify: Boolean read GetCanModify;
     property DataSource: TDataSource read GetDataSource;
     property DefaultFields: Boolean read FDefaultFields;

packages/fcl-db/src/export/fpdbexport.pp

@@ -702,7 +702,7 @@ Function TCustomDatasetExporter.Execute : Integer;
 
 Var
   B : Boolean;
-  BM : TBookMark;
+  BM : TBookMarkStr;
 
 begin
   Result:=0;