diff --git a/components/fpspreadsheet/examples/other/defined_names/demo_read_definednames.lpr b/components/fpspreadsheet/examples/other/defined_names/demo_read_definednames.lpr index 7bc1ebd29..bfcecb767 100644 --- a/components/fpspreadsheet/examples/other/defined_names/demo_read_definednames.lpr +++ b/components/fpspreadsheet/examples/other/defined_names/demo_read_definednames.lpr @@ -11,8 +11,8 @@ var // fmt: TsSpreadsheetFormat = xlsxOOXML; begin fn := 'test_defnames'; - fn := 'Mappe_illegalRef'; - fn := 'Mappe3'; +// fn := 'Mappe_illegalRef'; +// fn := 'Mappe3'; case fmt of sfOpenDocument: fn := fn + '.ods'; sfOOXML: fn := fn + '.xlsx'; @@ -49,10 +49,10 @@ begin else for j := 0 to ws.DefinedNames.Count-1 do begin - Write(' "', ws.DefinedNames[i].Name, '" --> '); + Write(' "', ws.DefinedNames[j].Name, '" --> '); case ExtractFileExt(fn) of - '.xlsx': WriteLn(ws.DefinedNames[i].RangeAsString(wb)); - '.ods': WriteLn(ws.DefinedNames[i].RangeAsString_ODS(wb)); + '.xlsx': WriteLn(ws.DefinedNames[j].RangeAsString(wb)); + '.ods': WriteLn(ws.DefinedNames[j].RangeAsString_ODS(wb)); end; end; diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas index ea47e9f53..806ecbf25 100644 --- a/components/fpspreadsheet/source/common/fpsopendocument.pas +++ b/components/fpspreadsheet/source/common/fpsopendocument.pas @@ -2689,8 +2689,8 @@ begin sheetName1 := book.GetFirstWorksheet.Name; ErrorRange(sheetName1); end else - if (TryStrToErrorValue(defExpr, '!', sheetName1, err) or - TryStrToErrorValue(defExpr, '.', sheetName2, err)) and + if (TryStrToErrorValue(defExpr, '.', sheetName1, err) or + TryStrToErrorValue(defExpr, '!', sheetName2, err)) and (err <> errOK) then // not clear whether '!' is correct; test file was created from Excel begin ErrorRange(sheetName1);