2 Sitoutukset a5121bed88 ... 1b2441fbca

Tekijä SHA1 Viesti Päivämäärä
  Piotr Czajkowski 1b2441fbca Better? 1 kuukausi sitten
  Piotr Czajkowski 5e572f95a9 Better lambdas 1 kuukausi sitten
2 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 2 2
      ExcelORM/ExcelORM/ExcelDynamicReader.cs
  2. 2 2
      ExcelORM/ExcelORM/ExcelReader.cs

+ 2 - 2
ExcelORM/ExcelORM/ExcelDynamicReader.cs

@@ -53,7 +53,7 @@ public sealed class ExcelDynamicReader : IDisposable
 
         var firstRow = worksheet.Row((int)startFrom);
         if (firstRow.IsEmpty())
-            firstRow = worksheet.RowsUsed().FirstOrDefault(x => x.RowNumber() > startFrom && !x.IsEmpty());
+            firstRow = worksheet.RowsUsed(x => x.RowNumber() > startFrom && !x.IsEmpty()).FirstOrDefault();
         
         if (firstRow == null || firstRow.IsEmpty()) yield break;
 
@@ -65,7 +65,7 @@ public sealed class ExcelDynamicReader : IDisposable
             true => worksheet.AutoFilter.VisibleRows
                 .Where(x => x.RowNumber() > firstRow.RowNumber())
                 .Select(x => x.WorksheetRow()),
-            false => worksheet.RowsUsed().Where(x => x.RowNumber() > firstRow.RowNumber())
+            false => worksheet.RowsUsed(x => x.RowNumber() > firstRow.RowNumber())
 
         };
 

+ 2 - 2
ExcelORM/ExcelORM/ExcelReader.cs

@@ -67,7 +67,7 @@ public sealed class ExcelReader : IDisposable
 
         var firstRow = worksheet.Row((int)startFrom);
         if (firstRow.IsEmpty())
-            firstRow = worksheet.RowsUsed().FirstOrDefault(x => x.RowNumber() > startFrom && !x.IsEmpty());
+            firstRow = worksheet.RowsUsed(x => x.RowNumber() > startFrom && !x.IsEmpty()).FirstOrDefault();
         
         if (firstRow == null || firstRow.IsEmpty()) yield break;
 
@@ -79,7 +79,7 @@ public sealed class ExcelReader : IDisposable
             true => worksheet.AutoFilter.VisibleRows
                 .Where(x => x.RowNumber() > firstRow.RowNumber())
                 .Select(x => x.WorksheetRow()),
-            false => worksheet.RowsUsed().Where(x => x.RowNumber() > firstRow.RowNumber())
+            false => worksheet.RowsUsed(x => x.RowNumber() > firstRow.RowNumber())
 
         };