paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Fix reading named cells with error in ods. Fix usage of incorrect filename in read_definednames demo.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9411 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-08-01 11:32:46 +00:00
parent 0269bdceff
commit 097576284f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/examples/other/defined_names/demo_read_definednames.lpr
View File

@ -11,8 +11,8 @@ var
// fmt: TsSpreadsheetFormat = xlsxOOXML; // fmt: TsSpreadsheetFormat = xlsxOOXML;
begin begin
fn := 'test_defnames'; fn := 'test_defnames';
fn := 'Mappe_illegalRef'; // fn := 'Mappe_illegalRef';
fn := 'Mappe3'; // fn := 'Mappe3';
case fmt of case fmt of
sfOpenDocument: fn := fn + '.ods'; sfOpenDocument: fn := fn + '.ods';
sfOOXML: fn := fn + '.xlsx'; sfOOXML: fn := fn + '.xlsx';
@ -49,10 +49,10 @@ begin
else else
for j := 0 to ws.DefinedNames.Count-1 do for j := 0 to ws.DefinedNames.Count-1 do
begin begin
Write(' "', ws.DefinedNames[i].Name, '" --> '); Write(' "', ws.DefinedNames[j].Name, '" --> ');
case ExtractFileExt(fn) of case ExtractFileExt(fn) of
'.xlsx': WriteLn(ws.DefinedNames[i].RangeAsString(wb)); '.xlsx': WriteLn(ws.DefinedNames[j].RangeAsString(wb));
'.ods': WriteLn(ws.DefinedNames[i].RangeAsString_ODS(wb)); '.ods': WriteLn(ws.DefinedNames[j].RangeAsString_ODS(wb));
end; end;
end; end;

4
components/fpspreadsheet/source/common/fpsopendocument.pas
View File

@ -2689,8 +2689,8 @@ begin
sheetName1 := book.GetFirstWorksheet.Name; sheetName1 := book.GetFirstWorksheet.Name;
ErrorRange(sheetName1); ErrorRange(sheetName1);
end else end else
if (TryStrToErrorValue(defExpr, '!', sheetName1, err) or if (TryStrToErrorValue(defExpr, '.', sheetName1, err) or
TryStrToErrorValue(defExpr, '.', sheetName2, err)) and TryStrToErrorValue(defExpr, '!', sheetName2, err)) and
(err <> errOK) then // not clear whether '!' is correct; test file was created from Excel (err <> errOK) then // not clear whether '!' is correct; test file was created from Excel
begin begin
ErrorRange(sheetName1); ErrorRange(sheetName1);