From 898c85aa46659a56ca8fe3a7c8e94c784d282a4b Mon Sep 17 00:00:00 2001 From: wp Date: Mon, 1 Apr 2019 10:55:36 +0000 Subject: [PATCH] TAChart: In TListChartSourceStrings, replace local function SourceClassString by NameOrClassName(). Part of patch by Marcin Wiazowski for issue #35302. git-svn-id: trunk@60810 - --- components/tachart/tasources.pas | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/components/tachart/tasources.pas b/components/tachart/tasources.pas index d132881260..4f8c19ae08 100644 --- a/components/tachart/tasources.pas +++ b/components/tachart/tasources.pas @@ -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