From b095079e914d11e268b2431d7866f76bf0def1ae Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 2 Jun 2014 08:07:56 +0000
Subject: [PATCH] fpspreadsheet: Fix failure of numformatparser to detect
 general number format (makes sample file t1s.xls in examples/fpschart usable
 again)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3126 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/fpspreadsheet/fpsnumformatparser.pas | 2 +-
 components/fpspreadsheet/fpspreadsheet.pas      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/fpspreadsheet/fpsnumformatparser.pas b/components/fpspreadsheet/fpsnumformatparser.pas
index 3c463bc11..b755fb94b 100644
--- a/components/fpspreadsheet/fpsnumformatparser.pas
+++ b/components/fpspreadsheet/fpsnumformatparser.pas
@@ -474,7 +474,7 @@ var
 begin
   FStatus := psOK;
   AddSection;
-  if AFormatString = '' then
+  if (AFormatString = '') or (lowercase(AFormatString) = 'general') then
     exit;
 
   FStart := @AFormatString[1];
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 6a76b6319..9776d0f49 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -3234,7 +3234,8 @@ begin
     fmt := lFormatData.FormatString;
   end else
     fmt := AFormatString;
-  nf := nfGeneral;  // not used here.
+
+  nf := nfGeneral;
 
   // Analyzes the format string and tries to convert it to fpSpreadsheet format.
   parser := TsNumFormatParser.Create(Workbook, fmt, nf, cdToFPSpreadsheet);