paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-20 04:51:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed references to sub components (mantis #18021)

Browse Source 
git-svn-id: trunk@16448 -
This commit is contained in:
michael 2010-11-26 14:51:43 +00:00
parent 11399b9b13
commit fa0454afe2
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rtl/objpas/classes/writer.inc
View File

@ -859,7 +859,7 @@ var
StrValue, DefStrValue: String;
UStrValue, UDefStrValue: UnicodeString;
AncestorObj: TObject;
Component: TComponent;
C,Component: TComponent;
ObjValue: TObject;
SavedAncestor: TPersistent;
SavedPropPath, Name: String;
@ -1080,19 +1080,28 @@ begin
if (ObjValue <> AncestorObj)
and not (csTransient in Component.ComponentStyle) then
begin
{ Determine the correct name of the component this property contains }
if Component.Owner = LookupRoot then
Name := Component.Name
else if Component = LookupRoot then
Name := 'Owner'
else if Assigned(Component.Owner) and (Length(Component.Owner.Name) > 0)
and (Length(Component.Name) > 0) then
Name := Component.Owner.Name + '.' + Component.Name
else if Length(Component.Name) > 0 then
Name := Component.Name + '.Owner'
else
SetLength(Name, 0);
Name:= '';
C:= Component;
While (C<>Nil) and (C.Name<>'') do
begin
If (Name<>'') Then
Name:='.'+Name;
if C.Owner = LookupRoot then
begin
Name := C.Name+Name;
break;
end
else if C = LookupRoot then
begin
Name := 'Owner' + Name;
break;
end;
Name:=C.Name + Name;
C:= C.Owner;
end;
if (C=nil) and (Component.Owner=nil) then
if (Name<>'') then //foreign root
Name:=Name+'.Owner';
if Length(Name) > 0 then
begin
Driver.BeginProperty(FPropPath + PPropInfo(PropInfo)^.Name);