From 81ff33e7d628d9ca51e1d292ce88d476df0cb2be Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Thu, 3 Jul 2014 16:12:43 +0000
Subject: [PATCH] fpspreadsheet: Fix incorrect column names left in ooxml
 format (issue #0026447)

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3273 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../examples/ooxmldemo/ooxmlwrite.lpi            | 16 +++++++---------
 .../examples/ooxmldemo/ooxmlwrite.lpr            |  2 ++
 components/fpspreadsheet/fpspreadsheet.pas       |  7 +------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
index 98c285969..b6001cc16 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
     <Version Value="9"/>
@@ -39,12 +39,11 @@
       <Unit0>
         <Filename Value="ooxmlwrite.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ooxmlwrite"/>
       </Unit0>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <SearchPaths>
       <OtherUnitFiles Value=".."/>
@@ -55,11 +54,10 @@
         <UseAnsiStrings Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <Other>
-      <CompilerMessages>
-        <UseMsgFile Value="True"/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
+    <Linking>
+      <Debugging>
+        <DebugInfoType Value="dsDwarf2Set"/>
+      </Debugging>
+    </Linking>
   </CompilerOptions>
 </CONFIG>
diff --git a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
index a461cc8d2..8e54ab8d0 100644
--- a/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
+++ b/components/fpspreadsheet/examples/ooxmldemo/ooxmlwrite.lpr
@@ -33,6 +33,8 @@ begin
   MyWorksheet.WriteNumber(0, 2, 3.0);
   MyWorksheet.WriteNumber(0, 3, 4.0);
 
+  MyWorksheet.WriteUTF8Text(0, 26, 'AA'); // Test for column name
+
 // Uncomment this to test large XLS files
   for i := 2 to 2{20} do
   begin
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 24ab8ccc7..206a5754b 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -1588,13 +1588,8 @@ end;
   and zero based, to a textual representation which is [Col][Row],
   being that the Col is in letters and the row is in 1-based numbers }
 class function TsWorksheet.CellPosToText(ARow, ACol: Cardinal): string;
-var
-  lStr: string;
 begin
-  lStr := '';
-  if ACol < 26 then lStr := Char(ACol+65);
-
-  Result := Format('%s%d', [lStr, ARow+1]);
+  Result := GetCellString(ARow, ACol, [rfRelCol, rfRelRow]);
 end;
 
 {@@