ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/runtime/IBCustomDataSet.pas

Comparing ibx/trunk/runtime/IBCustomDataSet.pas (file contents):
Revision 56 by tony, Mon Mar 6 10:20:02 2017 UTC vs.
Revision 58 by tony, Sat Mar 11 11:14:14 2017 UTC

#	Line 1089 | Line 1089 | procedure TIBMemoField.SetAsString(const
1089		var s: RawByteString;
1090		begin
1091		s := AValue;
1092	<	if StringCodePage(Value) <> CodePage then
1092	>	if StringCodePage(s) <> CodePage then
1093		SetCodePage(s,CodePage,CodePage<>CP_NONE);
1094		inherited SetAsString(s);
1095		end;
#	Line 1208 | Line 1208 | var
1208		s: RawByteString;
1209		begin
1210		Buffer := nil;
1211	<	IBAlloc(Buffer, 0, Size + 1);
1211	>	IBAlloc(Buffer, 0, DataSize);
1212		try
1213		s := Value;
1214		if StringCodePage(s) <> CodePage then
1215		SetCodePage(s,CodePage,CodePage<>CP_NONE);
1216	<	StrLCopy(Buffer, PChar(s), Size);
1216	>	StrLCopy(Buffer, PChar(s), DataSize-1);
1217		if Transliterate then
1218		DataSet.Translate(Buffer, Buffer, True);
1219		SetData(Buffer);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines