瀏覽代碼

* Reverse erronous commit of unchecked patch

git-svn-id: trunk@20885 -
michael 13 年之前
父節點
當前提交
3d366bca44
共有 2 個文件被更改,包括 8 次插入24 次删除
  1. 7 19
      packages/fcl-db/src/base/bufdataset.pas
  2. 1 5
      packages/fcl-db/src/base/datasource.inc

+ 7 - 19
packages/fcl-db/src/base/bufdataset.pas

@@ -36,20 +36,18 @@ type
     FieldNo : integer;
     OrgBufID: integer;
     Buffer  : pointer;
-    Size    : PtrInt;
+    Size    : ptrint;
   end;
 
   TBufBlobStream = class(TStream)
   private
     FBlobBuffer : PBlobBuffer;
-    FPosition   : PtrInt;
+    FPosition   : ptrint;
     FDataset    : TCustomBufDataset;
   protected
     function Read(var Buffer; Count: Longint): Longint; override;
     function Write(const Buffer; Count: Longint): Longint; override;
-    function Seek(const Offset: int64; Origin: TSeekOrigin): int64; override;
-    function GetPosition: Int64; override;
-    function GetSize : Int64; override;
+    function Seek(Offset: Longint; Origin: Word): Longint; override;
   public
     constructor Create(Field: TBlobField; Mode: TBlobStreamMode);
   end;
@@ -2392,27 +2390,17 @@ begin
   ABlobBuffer := Nil;
 end;
 
-function TBufBlobStream.Seek(const Offset: int64; Origin: TSeekOrigin): int64;
+function TBufBlobStream.Seek(Offset: Longint; Origin: Word): Longint;
 
 begin
   Case Origin of
-    soBeginning : FPosition:=Offset;
-    soEnd       : FPosition:=FBlobBuffer^.Size+Offset;
-    soCurrent   : FpoSition:=FPosition+Offset;
+    soFromBeginning : FPosition:=Offset;
+    soFromEnd       : FPosition:=FBlobBuffer^.Size+Offset;
+    soFromCurrent   : FpoSition:=FPosition+Offset;
   end;
   Result:=FPosition;
 end;
 
-function TBufBlobStream.GetPosition: Int64;
-begin
-  Result:=FPosition;
-end;
-
-function TBufBlobStream.GetSize: Int64;
-begin
-  Result:=FBlobBuffer^.Size;
-end;
-
 
 function TBufBlobStream.Read(var Buffer; Count: Longint): Longint;
 

+ 1 - 5
packages/fcl-db/src/base/datasource.inc

@@ -494,12 +494,8 @@ Procedure TMasterParamsDataLink.DoMasterDisable;
 
 begin
   Inherited;
-  if Assigned(Params) and Assigned(DetailDataset) and DetailDataset.Active then
-    begin
-    DetailDataSet.CheckBrowseMode;
+  If Assigned(DetailDataset) and DetailDataset.Active then
     DetailDataset.Close;
-    DetailDataset.Open;
-    end;
 end;
 
 Procedure TMasterParamsDataLink.DoMasterChange;