paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-01 14:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: In TListChartSourceStrings, replace local function SourceClassString by NameOrClassName(). Part of patch by Marcin Wiazowski for issue #35302.

Browse Source 
git-svn-id: trunk@60810 -
This commit is contained in:
wp 2019-04-01 10:55:36 +00:00
parent 0c695d9c39
commit 898c85aa46
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/tachart/tasources.pas
View File

@ -397,11 +397,6 @@ var
p += 1;
end;
function SourceClassString: String;
begin
Result := IfThen(FSource.Name <> '', FSource.Name, FSource.ClassName);
end;
function StrToFloatOrDateTime(const AStr: String): Double;
begin
if (AStr = '') or (AStr = '?') then
@ -411,7 +406,7 @@ var
not TryStrToFloat(AStr, Result) and
not TryStrToDateTime(AStr, Result)
then
raise EListSourceStringError.CreateFmt(rsListSourceNumericError, [SourceClassString, AStr]);
raise EListSourceStringError.CreateFmt(rsListSourceNumericError, [NameOrClassName(FSource), AStr]);
end;
end;
@ -421,7 +416,7 @@ var
Result := clTAColor
else
if not TryStrToInt(AStr, Result) then
raise EListSourceStringError.CreateFmt(rsListSourceColorError, [SourceClassString, AStr]);
raise EListSourceStringError.CreateFmt(rsListSourceColorError, [NameOrClassName(FSource), AStr]);
end;
var
@ -436,7 +431,7 @@ begin
// Text must be quoted if it contains '|'.
if (Cardinal(parts.Count) <> FSource.XCount + FSource.YCount + 2) then
raise EListSourceStringError.CreateFmt(
rsListSourceStringFormatError, [SourceClassString, ChopString(AString, 20)]);
rsListSourceStringFormatError, [NameOrClassName(FSource), ChopString(AString, 20)]);
with ADataItem^ do begin
if FSource.XCount > 0 then begin