pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Delphi compatibility fix.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3054 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-05-17 17:24:38 +00:00
parent f638eb928a
commit 3c995d69dd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wst/trunk/ws_helper/xsd_generator.pas
View File

@@ -1259,7 +1259,7 @@ procedure TBaseArrayRemotable_TypeHandler.Generate(
ADocument : TDOMDocument ADocument : TDOMDocument
); );
function GetNameSpaceShortName(const ANameSpace : string):string;overload; function GetNameSpaceSN(const ANameSpace : string):string;overload;
begin begin
Result := GetNameSpaceShortName(ANameSpace,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames()); Result := GetNameSpaceShortName(ANameSpace,GetSchemaNode(ADocument),GetOwner().GetPreferedShortNames());
end; end;
@@ -1282,7 +1282,7 @@ begin
Exit; Exit;
if Assigned(typItm) then begin if Assigned(typItm) then begin
unitExternalName := GetTypeNameSpace(AContainer,typItm); unitExternalName := GetTypeNameSpace(AContainer,typItm);
GetNameSpaceShortName(unitExternalName); GetNameSpaceSN(unitExternalName);
defSchemaNode := GetSchemaNode(ADocument) as TDOMElement; defSchemaNode := GetSchemaNode(ADocument) as TDOMElement;
s := Format('%s:%s',[s_xs_short,s_complexType]); s := Format('%s:%s',[s_xs_short,s_complexType]);
@@ -1308,7 +1308,7 @@ begin
DeclareAttributeOf_WST(propNode,s_WST_collection,'true'); DeclareAttributeOf_WST(propNode,s_WST_collection,'true');
end; end;
if Assigned(propTypItm) then begin if Assigned(propTypItm) then begin
prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm));// AContainer.GetExternalName(propTypItm.Parent.Parent)); prop_ns_shortName := GetNameSpaceSN(GetTypeNameSpace(AContainer,propTypItm));// AContainer.GetExternalName(propTypItm.Parent.Parent));
propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,AContainer.GetExternalName(propTypItm)])); propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,AContainer.GetExternalName(propTypItm)]));
if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin if propTypItm.InheritsFrom(TPasNativeSpecialSimpleType) then begin
if GetRegistry().FindHelper(propTypItm,typeHelper) then if GetRegistry().FindHelper(propTypItm,typeHelper) then