paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 22:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazReport: use DefaultFormatSettings.DecimalSeparator instead of deprecated DecimalSeparator.

Browse Source 
git-svn-id: trunk@47259 -
This commit is contained in:
bart 2014-12-28 11:12:08 +00:00
parent 3cd80e36ac
commit 5b146f662c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazreport/source/lr_class.pas
View File

@ -2409,7 +2409,7 @@ begin
fFrameWidth := 1;
fFrameColor := clBlack;
FFillColor := clNone;
fFormat := 2*256 + Ord(DecimalSeparator);
fFormat := 2*256 + Ord(DefaultFormatSettings.DecimalSeparator);
BaseName := 'View';
FVisible := True;
StreamMode := smDesigning;
@ -9693,7 +9693,7 @@ begin
Exit;
end;
c := DecimalSeparator;
c := DefaultFormatSettings.DecimalSeparator;
f1 := (AFormat div $01000000) and $0F;
f2 := (AFormat div $00010000) and $FF;
try
@ -9714,7 +9714,7 @@ begin
if not VarIsNumeric(v) then
result := v
else begin
DecimalSeparator := Chr(AFormat and $FF);
DefaultFormatSettings.DecimalSeparator := Chr(AFormat and $FF);
case f2 of
0: Result := FormatFloat('###.##', v);
1: Result := FloatToStrF(Extended(v), ffFixed, 15, (AFormat div $0100) and $FF);
@ -9753,7 +9753,7 @@ begin
on e:exception do
Result := v;
end;
DecimalSeparator := c;
DefaultFormatSettings.DecimalSeparator := c;
end;
procedure TfrReport.GetVariableValue(const s: String; var aValue: Variant);

4
components/lazreport/source/lr_fmted.pas
View File

@ -151,7 +151,7 @@ begin
Label5.Caption := sFmtFormDeciD;
Label6.Caption := sFmtFormFrac;
Label1.Caption := sFmtFormFrmt;
SplEdit.Text := DecimalSeparator;
SplEdit.Text := DefaultFormatSettings.DecimalSeparator;
end;
procedure TfrFmtForm.frFmtFormShow(Sender: TObject);
@ -197,7 +197,7 @@ var
begin
Result := ComboBox1.ItemIndex * $01000000 + ComboBox2.ItemIndex * $00010000 +
StrToIntDef(Edit3.Text, 0) * $00000100;
c := DecimalSeparator;
c := DefaultFormatSettings.DecimalSeparator;
if SplEdit.Text <> '' then
c := SplEdit.Text[1];
Result := Result + Ord(c);