diff --git a/ClosedXML/Excel/Columns/XLColumn.cs b/ClosedXML/Excel/Columns/XLColumn.cs index 3a4e6b7..cb8aae5 100644 --- a/ClosedXML/Excel/Columns/XLColumn.cs +++ b/ClosedXML/Excel/Columns/XLColumn.cs @@ -663,8 +663,8 @@ private void WorksheetRangeShiftedColumns(XLRange range, int columnsShifted) { - if (!range.RangeAddress.IsInvalid && - !RangeAddress.IsInvalid && + if (range.RangeAddress.IsValid && + RangeAddress.IsValid && range.RangeAddress.FirstAddress.ColumnNumber <= ColumnNumber()) SetColumnNumber(ColumnNumber() + columnsShifted); } @@ -672,10 +672,10 @@ private void SetColumnNumber(int column) { if (column <= 0) - RangeAddress.IsInvalid = true; + RangeAddress.IsValid = false; else { - RangeAddress.IsInvalid = false; + RangeAddress.IsValid = true; RangeAddress.FirstAddress = new XLAddress(Worksheet, 1, column, diff --git a/ClosedXML/Excel/Ranges/IXLRangeAddress.cs b/ClosedXML/Excel/Ranges/IXLRangeAddress.cs index 86ed2b1..751f1a4 100644 --- a/ClosedXML/Excel/Ranges/IXLRangeAddress.cs +++ b/ClosedXML/Excel/Ranges/IXLRangeAddress.cs @@ -13,12 +13,12 @@ IXLAddress FirstAddress { get; set; } /// - /// Gets or sets a value indicating whether this range is invalid. + /// Gets or sets a value indicating whether this range is valid. /// /// - /// true if this instance is invalid; otherwise, false. + /// true if this instance is valid; otherwise, false. /// - Boolean IsInvalid { get; set; } + Boolean IsValid { get; } /// /// Gets or sets the last address in the range. diff --git a/ClosedXML/Excel/Ranges/XLRangeAddress.cs b/ClosedXML/Excel/Ranges/XLRangeAddress.cs index 177677e..d900347 100644 --- a/ClosedXML/Excel/Ranges/XLRangeAddress.cs +++ b/ClosedXML/Excel/Ranges/XLRangeAddress.cs @@ -84,7 +84,7 @@ { get { - if (IsInvalid) + if (!IsValid) throw new InvalidOperationException("Range is invalid."); return _firstAddress; @@ -96,7 +96,7 @@ { get { - if (IsInvalid) + if (!IsValid) throw new InvalidOperationException("Range is an invalid state."); return _lastAddress; @@ -123,7 +123,7 @@ set { LastAddress = value as XLAddress; } } - public bool IsInvalid { get; set; } + public bool IsValid { get; set; } = true; #endregion Public properties diff --git a/ClosedXML/Excel/Ranges/XLRangeBase.cs b/ClosedXML/Excel/Ranges/XLRangeBase.cs index 7453cf3..2458574 100644 --- a/ClosedXML/Excel/Ranges/XLRangeBase.cs +++ b/ClosedXML/Excel/Ranges/XLRangeBase.cs @@ -443,7 +443,7 @@ public bool Intersects(IXLRangeBase range) { - if (range.RangeAddress.IsInvalid || RangeAddress.IsInvalid) + if (!range.RangeAddress.IsValid || !RangeAddress.IsValid) return false; var ma = range.RangeAddress; var ra = RangeAddress; @@ -1564,7 +1564,7 @@ protected void ShiftColumns(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int columnsShifted) { - if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return; + if (!thisRangeAddress.IsValid || !shiftedRange.RangeAddress.IsValid) return; bool allRowsAreCovered = thisRangeAddress.FirstAddress.RowNumber >= shiftedRange.RangeAddress.FirstAddress.RowNumber && thisRangeAddress.LastAddress.RowNumber <= shiftedRange.RangeAddress.LastAddress.RowNumber; @@ -1594,7 +1594,7 @@ if (destroyedByShift) { - thisRangeAddress.IsInvalid = true; + (thisRangeAddress as XLRangeAddress).IsValid = false; return; } @@ -1615,7 +1615,7 @@ protected void ShiftRows(IXLRangeAddress thisRangeAddress, XLRange shiftedRange, int rowsShifted) { - if (thisRangeAddress.IsInvalid || shiftedRange.RangeAddress.IsInvalid) return; + if (!thisRangeAddress.IsValid || !shiftedRange.RangeAddress.IsValid) return; bool allColumnsAreCovered = thisRangeAddress.FirstAddress.ColumnNumber >= shiftedRange.RangeAddress.FirstAddress.ColumnNumber && thisRangeAddress.LastAddress.ColumnNumber <= shiftedRange.RangeAddress.LastAddress.ColumnNumber; @@ -1645,7 +1645,7 @@ if (destroyedByShift) { - thisRangeAddress.IsInvalid = true; + (thisRangeAddress as XLRangeAddress).IsValid = false; return; } diff --git a/ClosedXML/Excel/Ranges/XLRanges.cs b/ClosedXML/Excel/Ranges/XLRanges.cs index d1901b2..fcca3f6 100644 --- a/ClosedXML/Excel/Ranges/XLRanges.cs +++ b/ClosedXML/Excel/Ranges/XLRanges.cs @@ -74,12 +74,12 @@ public Boolean Contains(IXLCell cell) { - return _ranges.Any(r => !r.RangeAddress.IsInvalid && r.Contains(cell)); + return _ranges.Any(r => r.RangeAddress.IsValid && r.Contains(cell)); } public Boolean Contains(IXLRange range) { - return _ranges.Any(r => !r.RangeAddress.IsInvalid && r.Contains(range)); + return _ranges.Any(r => r.RangeAddress.IsValid && r.Contains(range)); } public IEnumerable DataValidation diff --git a/ClosedXML/Excel/Rows/XLRow.cs b/ClosedXML/Excel/Rows/XLRow.cs index 1a7dc03..e7f4cd8 100644 --- a/ClosedXML/Excel/Rows/XLRow.cs +++ b/ClosedXML/Excel/Rows/XLRow.cs @@ -597,8 +597,8 @@ private void WorksheetRangeShiftedRows(XLRange range, int rowsShifted) { - if (!range.RangeAddress.IsInvalid && - !RangeAddress.IsInvalid && + if (range.RangeAddress.IsValid && + RangeAddress.IsValid && range.RangeAddress.FirstAddress.RowNumber <= RowNumber()) SetRowNumber(RowNumber() + rowsShifted); } @@ -606,10 +606,10 @@ private void SetRowNumber(Int32 row) { if (row <= 0) - RangeAddress.IsInvalid = true; + RangeAddress.IsValid = false; else { - RangeAddress.IsInvalid = false; + RangeAddress.IsValid = true; RangeAddress.FirstAddress = new XLAddress(Worksheet, row, 1, RangeAddress.FirstAddress.FixedRow, RangeAddress.FirstAddress.FixedColumn); RangeAddress.LastAddress = new XLAddress(Worksheet, diff --git a/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/Excel/XLWorksheet.cs index 541b76e..af55419 100644 --- a/ClosedXML/Excel/XLWorksheet.cs +++ b/ClosedXML/Excel/XLWorksheet.cs @@ -1231,7 +1231,7 @@ cfAddress.LastAddress.RowNumber, cfAddress.LastAddress.ColumnNumber + columnsShifted); } - if (cf.Range.RangeAddress.IsInvalid || + if (!cf.Range.RangeAddress.IsValid || cf.Range.RangeAddress.FirstAddress.ColumnNumber > cf.Range.RangeAddress.LastAddress.ColumnNumber) ConditionalFormats.Remove(f => f == cf); } @@ -1305,7 +1305,7 @@ cfAddress.LastAddress.RowNumber + rowsShifted, cfAddress.LastAddress.ColumnNumber); } - if (cf.Range.RangeAddress.IsInvalid || + if (!cf.Range.RangeAddress.IsValid || cf.Range.RangeAddress.FirstAddress.RowNumber > cf.Range.RangeAddress.LastAddress.RowNumber) ConditionalFormats.Remove(f => f == cf); } diff --git a/ClosedXML/XLHelper.cs b/ClosedXML/XLHelper.cs index dd08d44..1c1081d 100644 --- a/ClosedXML/XLHelper.cs +++ b/ClosedXML/XLHelper.cs @@ -175,7 +175,7 @@ public static Boolean IsValidRangeAddress(IXLRangeAddress rangeAddress) { - return !rangeAddress.IsInvalid + return rangeAddress.IsValid && rangeAddress.FirstAddress.RowNumber >= 1 && rangeAddress.LastAddress.RowNumber <= MaxRowNumber && rangeAddress.FirstAddress.ColumnNumber >= 1 && rangeAddress.LastAddress.ColumnNumber <= MaxColumnNumber && rangeAddress.FirstAddress.RowNumber <= rangeAddress.LastAddress.RowNumber diff --git a/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs b/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs index 6b68014..20d17f0 100644 --- a/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs +++ b/ClosedXML_Tests/Excel/AutoFilters/AutoFilterTests.cs @@ -125,7 +125,7 @@ } } } - + [Test] [TestCase("A1:A4")] [TestCase("A1:B4")] @@ -152,7 +152,7 @@ range.InsertColumnsBefore(1); //Assert - Assert.IsFalse(ws.AutoFilter.Range.RangeAddress.IsInvalid); + Assert.IsTrue(ws.AutoFilter.Range.RangeAddress.IsValid); } } } diff --git a/ClosedXML_Tests/Excel/Columns/ColumnTests.cs b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs index ef6bd08..0d13b93 100644 --- a/ClosedXML_Tests/Excel/Columns/ColumnTests.cs +++ b/ClosedXML_Tests/Excel/Columns/ColumnTests.cs @@ -244,7 +244,7 @@ var column = new XLColumn(-1, new XLColumnParameters(ws, 0, false)); - Assert.IsTrue(column.RangeAddress.IsInvalid); + Assert.IsFalse(column.RangeAddress.IsValid); } } } diff --git a/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs b/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs index 87e90ed..57092e6 100644 --- a/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs +++ b/ClosedXML_Tests/Excel/Ranges/InsertingRangesTests.cs @@ -139,7 +139,7 @@ thisRange.WorksheetRangeShiftedColumns(shiftedRange, shiftedColumns); - Assert.IsFalse(thisRange.RangeAddress.IsInvalid); + Assert.IsTrue(thisRange.RangeAddress.IsValid); Assert.AreEqual(expectedRange, thisRange.RangeAddress.ToString()); } } @@ -157,7 +157,7 @@ thisRange.WorksheetRangeShiftedColumns(shiftedRange, shiftedColumns); - Assert.IsTrue(thisRange.RangeAddress.IsInvalid); + Assert.IsFalse(thisRange.RangeAddress.IsValid); } } @@ -192,7 +192,7 @@ thisRange.WorksheetRangeShiftedRows(shiftedRange, shiftedRows); - Assert.IsFalse(thisRange.RangeAddress.IsInvalid); + Assert.IsTrue(thisRange.RangeAddress.IsValid); Assert.AreEqual(expectedRange, thisRange.RangeAddress.ToString()); } } @@ -209,7 +209,7 @@ thisRange.WorksheetRangeShiftedRows(shiftedRange, shiftedRows); - Assert.IsTrue(thisRange.RangeAddress.IsInvalid); + Assert.IsFalse(thisRange.RangeAddress.IsValid); } } } diff --git a/ClosedXML_Tests/Excel/Rows/RowTests.cs b/ClosedXML_Tests/Excel/Rows/RowTests.cs index 003a5e1..6453623 100644 --- a/ClosedXML_Tests/Excel/Rows/RowTests.cs +++ b/ClosedXML_Tests/Excel/Rows/RowTests.cs @@ -261,7 +261,7 @@ var row = new XLRow(-1, new XLRowParameters(ws, 0, false)); - Assert.IsTrue(row.RangeAddress.IsInvalid); + Assert.IsFalse(row.RangeAddress.IsValid); } } }