diff --git a/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/Excel/Ranges/XLRangeBase.cs index 02a862a..0604aef 100644 --- a/ClosedXML/Excel/Ranges/XLRangeBase.cs +++ b/ClosedXML/Excel/Ranges/XLRangeBase.cs @@ -765,7 +765,7 @@ return Cell(cellAddressInRange.RowNumber, cellAddressInRange.ColumnNumber); } - public XLCell Cell(XLAddress cellAddressInRange) + public XLCell Cell(in XLAddress cellAddressInRange) { Int32 absRow = cellAddressInRange.RowNumber + RangeAddress.FirstAddress.RowNumber - 1; Int32 absColumn = cellAddressInRange.ColumnNumber + RangeAddress.FirstAddress.ColumnNumber - 1; diff --git a/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/Excel/XLWorkbook_Load.cs index 8e8f4ec..f633113 100644 --- a/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/Excel/XLWorkbook_Load.cs @@ -1379,14 +1379,15 @@ { Int32 styleIndex = cell.StyleIndex != null ? Int32.Parse(cell.StyleIndex.InnerText) : 0; - String cellReference = cell.CellReference == null - ? XLHelper.GetColumnLetterFromNumber(++lastCell) + rowIndex - : cell.CellReference.Value; - var xlCell = ws.CellFast(cellReference); + var cellAddress = cell.CellReference == null + ? new XLAddress(ws, ++lastCell, rowIndex, false, false) + : XLAddress.Create(ws, cell.CellReference.Value); + + var xlCell = ws.Cell(in cellAddress); if (styleList.ContainsKey(styleIndex)) { - xlCell.Style = styleList[styleIndex]; + xlCell.InnerStyle = styleList[styleIndex]; } else { @@ -1566,14 +1567,14 @@ if (s.NumberingFormats != null && s.NumberingFormats.Any(nf => ((NumberingFormat)nf).NumberFormatId.Value == numberFormatId)) { - xlCell.Style.NumberFormat.Format = + xlCell.InnerStyle.NumberFormat.Format = ((NumberingFormat)s.NumberingFormats .First( nf => ((NumberingFormat)nf).NumberFormatId.Value == numberFormatId) ).FormatCode.Value; } else - xlCell.Style.NumberFormat.NumberFormatId = Int32.Parse(numberFormatId); + xlCell.InnerStyle.NumberFormat.NumberFormatId = Int32.Parse(numberFormatId); } } diff --git a/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/Excel/XLWorksheet.cs index 443a48c..57e0d6a 100644 --- a/ClosedXML/Excel/XLWorksheet.cs +++ b/ClosedXML/Excel/XLWorksheet.cs @@ -1440,11 +1440,6 @@ return (XLCell)namedRanges?.Ranges?.FirstOrDefault()?.FirstCell(); } - internal XLCell CellFast(String cellAddressInRange) - { - return Cell(XLAddress.Create(this, cellAddressInRange)); - } - public override XLRange Range(String rangeAddressStr) { if (XLHelper.IsValidRangeAddress(rangeAddressStr))