paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 10:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Inoussa Ouedraogo to make assigning widechar to variant Delphi 2009+ compatible (Bug ID 25719)

Browse Source 
git-svn-id: trunk@26873 -
This commit is contained in:
michael 2014-02-25 08:53:03 +00:00
parent d9df0ff9a8
commit aac74f4d0a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtl/inc/variant.inc
View File

@ -232,8 +232,11 @@ end;
operator :=(const source : widechar) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif} operator :=(const source : widechar) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
var
ws : WideString;
begin begin
Variantmanager.varfromInt(Dest,word(Source),2); ws:=source;
Variantmanager.varfromwstr(Dest,ws);
end; end;
{ Strings } { Strings }
@ -426,8 +429,12 @@ end;
operator :=(const source : variant) dest : widechar;{$ifdef SYSTEMINLINE}inline;{$endif} operator :=(const source : variant) dest : widechar;{$ifdef SYSTEMINLINE}inline;{$endif}
Var
S : WideString;
begin begin
dest:=widechar(variantmanager.vartoint(source)); VariantManager.vartowstr(S,Source);
If Length(S)>0 then
Dest:=S[1];
end; end;