paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* (modified) patch by Do-wan Kim to resolve #27354

Browse Source 
git-svn-id: trunk@29645 -
This commit is contained in:
florian 2015-02-07 22:14:35 +00:00
parent a99c9c29b6
commit 9ebc092ade
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/rtl-objpas/src/inc/variants.pp
View File

@ -2255,12 +2255,16 @@ begin
Dest.vType := varString;
Dest.vString := nil;
AnsiString(Dest.vString) := AnsiString(vString);
end else if vType = varOleStr then begin
Dest.vType := varOleStr;
Dest.vOleStr := nil;
WideString(Pointer(Dest.vOleStr)) := WideString(Pointer(vOleStr));
end else if vType = varAny then begin
Dest := Source;
RefAnyProc(Dest);
end else if vType and varArray <> 0 then
DoVarCopyArray(Dest, Source, @DoVarCopy)
else if (vType and varByRef <> 0) and (vType xor varByRef = varString) then
else if (vType and varByRef <> 0) and ((vType xor varByRef) in [varString,varOleStr]) then
Dest := Source
else if FindCustomVariantType(vType, Handler) then
Handler.Copy(Dest, Source, False)