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

Delphi 7 compatibility fix : handle "TStringList.StrictDelimiter" + test

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3356 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-07-22 12:25:22 +00:00
parent ba37ace85f
commit 38bb8b4756
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
wst/trunk/imp_utils.pas
View File

@@ -63,7 +63,10 @@ Type
function LoadBufferFromFile(const AFileName : string) : TByteDynArray;
function LoadBufferFromStream(AStream : TStream) : TByteDynArray;
{$IFNDEF WST_HAS_STRICT_DELIMITER}
procedure SetListData(AList : TStringList; const AText : string);
{$ENDIF WST_HAS_STRICT_DELIMITER}
implementation
function IsStrEmpty(Const AStr:String):Boolean;
@@ -256,6 +259,33 @@ begin
end;
end;
{$IFNDEF WST_HAS_STRICT_DELIMITER}
procedure SetListData(AList : TStringList; const AText : string);
var
i, oldPos, c : Integer;
s : string;
begin
c := Length(AText);
oldPos := 1;
s := '';
i := 1;
while (i <= c) do begin
if (AText[i] = PROP_LIST_DELIMITER) then begin
s := Copy(AText,oldPos,(i-oldPos));
if (s <> '') then
AList.Add(s);
oldPos := i+1;
end;
i := i+1;
end;
if (i > oldPos) then begin
s := Copy(AText,oldPos,(i-oldPos));
if (s <> '') then
AList.Add(s);
end;
end;
{$ENDIF WST_HAS_STRICT_DELIMITER}
procedure TPublishedPropertyManager.SetProperties(const APropsStr: string);
var
lst : TStringList;
@@ -265,10 +295,14 @@ begin
Exit;
lst := TStringList.Create();
Try
{$IFDEF WST_HAS_STRICT_DELIMITER}
lst.QuoteChar := #0;
lst.Delimiter := PROP_LIST_DELIMITER;
lst.StrictDelimiter := True;
lst.DelimitedText := APropsStr;
{$ELSE WST_HAS_STRICT_DELIMITER}
SetListData(lst,APropsStr);
{$ENDIF WST_HAS_STRICT_DELIMITER}
for i := 0 to Pred(lst.Count) do
SetProperty(lst.Names[i],lst.Values[lst.Names[i]]);
Finally