paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 12:49:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix from Bart for issue #39938

Browse Source
This commit is contained in:
Michaël Van Canneyt 2022-10-04 11:14:00 +02:00
parent f8848dd185
commit e736011c37
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
packages/fcl-base/src/maskutils.pp
View File

@ -780,31 +780,34 @@ begin
end//FMaskSave = True end//FMaskSave = True
else else
begin//FMaskSave = False begin//FMaskSave = False
if FTrimType = metTrimRight then if Value<>'' then
begin begin
//fill text from left to rigth, skipping MaskLiterals if FTrimType = metTrimRight then
j := 1;
for i := 1 to FMaskLength do
begin begin
if not IsLiteral(FMask[i]) then //fill text from left to rigth, skipping MaskLiterals
j := 1;
for i := 1 to FMaskLength do
begin begin
if (AValue[j] = #32) then S[i]:= FSpaceChar else S[i] := AValue[j]; if not IsLiteral(FMask[i]) then
Inc(j); begin
if j > Length(AValue) then Break; if (AValue[j] = #32) then S[i]:= FSpaceChar else S[i] := AValue[j];
Inc(j);
if j > Length(AValue) then Break;
end;
end; end;
end; end
end else
else
begin
//fill text from right to left, skipping MaskLiterals
j := Length(AValue);
for i := FMaskLength downto 1 do
begin begin
if not IsLiteral(FMask[i]) then //fill text from right to left, skipping MaskLiterals
j := Length(AValue);
for i := FMaskLength downto 1 do
begin begin
if (AValue[j] = #32) then S[i] := FSpaceChar else S[i] := AValue[j]; if not IsLiteral(FMask[i]) then
Dec(j); begin
if j < 1 then Break; if (AValue[j] = #32) then S[i] := FSpaceChar else S[i] := AValue[j];
Dec(j);
if j < 1 then Break;
end;
end; end;
end; end;
end; end;