pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Rearrange ODS reading code for conditional formats.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7552 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-07-21 17:53:20 +00:00
parent 7b2c2c3d4c
commit faf6f72ab8
4 changed files with 632 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
components/fpspreadsheet/source/common/fpsutils.pas
View File

@@ -121,6 +121,9 @@ function GetCellRangeString_R1C1(ASheet1, ASheet2: String;
function SheetNameNeedsQuotes(ASheet: String): Boolean;
// OpenDocument Syntax
function TryStrToCellRange_ODS(const AStr: String; out ASheet1, ASheet2: String;
out ARow1, ACol1, ARow2, ACol2: Cardinal; out AFlags: TsRelFlags): Boolean;
function GetCellRangeString_ODS(ASheet1, ASheet2: String; ARow1, ACol1, ARow2, ACol2: Cardinal;
AFlags: TsRelFlags = rfAllRel): String; overload;
function GetCellRangeString_ODS(ARow1, ACol1, ARow2, ACol2: Cardinal;
@@ -1308,6 +1311,65 @@ begin
end;
{@@ ----------------------------------------------------------------------------
Extracts sheets names and cell coordinates from a cell range string in
OpenDocument syntax, e.g. "Table1.A1:Table2.B4"
-------------------------------------------------------------------------------}
function TryStrToCellRange_ODS(const AStr: String; out ASheet1, ASheet2: String;
out ARow1, ACol1, ARow2, ACol2: Cardinal; out AFlags: TsRelFlags): Boolean;
var
p: Integer;
cell1Str, cell2Str: String;
f: TsRelFlags;
begin
p := Pos(':', AStr);
if p = 0 then
begin
cell1Str := AStr;
cell2Str := '';
end else
begin
cell1str := Copy(AStr, 1, p-1);
cell2Str := Copy(AStr, p+1, MaxInt);
end;
p := pos('.', cell1Str);
if p = 0 then
ASheet1 := ''
else
begin
ASheet1 := Copy(cell1Str, 1, p-1);
cell1Str := Copy(cell1Str, p+1, MaxInt);
end;
Result := ParseCellString(cell1Str, ARow1, ACol1, AFlags);
if not Result then
exit;
if cell2Str <> '' then
begin
p := pos('.', cell2Str);
if p = 0 then
ASheet2 := ''
else
begin
ASheet2 := Copy(cell2Str, 1, p-1);
cell2Str := Copy(cell2Str, p+1, MaxInt);
end;
Result := ParseCellString(cell2Str, ARow2, ACol2, f);
if (rfRelRow in f) then Include(AFlags, rfRelRow2);
if (rfRelCol in f) then Include(Aflags, rfRelCol2);
end else
begin
ASheet2 := ASheet1;
ARow2 := ARow1;
ACol2 := ACol2;
if (rfRelRow in AFlags) then Include(AFlags, rfRelRow2);
if (rfRelCol in AFlags) then Include(AFlags, rfRelCol2);
end;
end;
{@@ ----------------------------------------------------------------------------
Calculates a cell range string with sheet specification in OpenDocument syntax
-------------------------------------------------------------------------------}