ENI2/Controls/MaerskListControl.xaml.cs

@@ -338,8 +338,7 @@ namespace ENI2.Controls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row

ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs

@@ -1051,8 +1051,7 @@ namespace ENI2.DetailViewControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present
@@ -1122,8 +1121,7 @@ namespace ENI2.DetailViewControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present
@@ -1194,8 +1192,7 @@ namespace ENI2.DetailViewControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1);
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present
@@ -1271,8 +1268,7 @@ namespace ENI2.DetailViewControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1);
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present

ENI2/DetailViewControls/WasteDetailControl.xaml.cs

@@ -485,8 +485,7 @@ namespace ENI2.DetailViewControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(3); // Skip first three rows

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>7.2.14.0</ApplicationVersion>
+    <ApplicationVersion>7.2.13.2</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI2/Excel/ExcelBase.cs

@@ -9,7 +9,6 @@ using System.Globalization;
 using System.Text.RegularExpressions;
 using System.Drawing;
 using System.Linq;
-using System.IO;
 
 namespace ENI2.Excel
 {
@@ -23,7 +22,6 @@ namespace ENI2.Excel
         protected CountryMode _countryMode = CountryMode.DE;
 
         protected XLWorkbook _workBook;
-        protected FileStream _workBookStream;
         protected Dictionary<string, IXLDefinedName> _nameDict;
         protected ILog _log;
 
@@ -103,12 +101,6 @@ namespace ENI2.Excel
             }
         }
 
-        protected void OpenWorkbookReadOnly(string path)
-        {
-            _workBookStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-            _workBook = new XLWorkbook(_workBookStream);
-        }
-
         private static double? ParseAnyDouble(string val)
         {
             double? result = null;
@@ -220,11 +212,6 @@ namespace ENI2.Excel
                     _workBook.Dispose();
                     _workBook = null;
                 }
-                if (_workBookStream != null)
-                {
-                    _workBookStream.Dispose();
-                    _workBookStream = null;
-                }
             }
             catch (Exception ex)
             {

ENI2/Excel/ExcelComparer.cs

@@ -53,10 +53,8 @@ namespace ENI2.Excel
             {
                 File.Copy(targetPath, comparisonFileName, true);
 
-                using (var sourceStream = new FileStream(sourcePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                using (var sourceWorkbook = new XLWorkbook(sourcePath))
-                using (var sourceWorkbook = new XLWorkbook(sourceStream))
+                using (var comparisonWorkbook = new XLWorkbook(comparisonFileName))
-                using (var comparisonStream = new FileStream(comparisonFileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
-                using (var comparisonWorkbook = new XLWorkbook(comparisonStream))
                 {
                     // Es werden Zellen der "used range" miteinander verglichen
                     foreach (var sourceSheet in sourceWorkbook.Worksheets)

ENI2/Excel/ExcelLocalImportHelper.cs

@@ -26,8 +26,7 @@ namespace ENI2.Excel
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1);
                         var rows = worksheet.RangeUsed().RowsUsed();
@@ -145,8 +144,7 @@ namespace ENI2.Excel
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1);
                         var rows = worksheet.RangeUsed().RowsUsed();

ENI2/Excel/ExcelReader.cs

@@ -32,7 +32,7 @@ namespace ENI2.Excel
 
         public ExcelReader(string filePath, bool createNameFields = true)
         {
-            this.OpenWorkbookReadOnly(filePath);
+            this._workBook = new XLWorkbook(filePath);
             if (createNameFields)
                 this.InitNameFields();
 

ENI2/Excel/ExcelWriter.cs

@@ -26,7 +26,7 @@ namespace ENI2.Excel
             if (isRefSheet) filename = @"Excel\Reference_Sheet_DE.xlsx";
 
             string refFilePath = System.IO.Path.Combine(Environment.CurrentDirectory, filename);
-            this.OpenWorkbookReadOnly(refFilePath);
+            this._workBook = new XLWorkbook(refFilePath);
 
             this.InitNameFields();
         }

ENI2/SheetDisplayControls/CrewDepartureControl.xaml.cs

@@ -128,8 +128,7 @@ namespace ENI2.SheetDisplayControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present

ENI2/SheetDisplayControls/CrewPreArrivalControl.xaml.cs

@@ -168,8 +168,7 @@ namespace ENI2.SheetDisplayControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present

ENI2/SheetDisplayControls/PassengerDepartureControl.xaml.cs

@@ -146,8 +146,7 @@ namespace ENI2.SheetDisplayControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present

ENI2/SheetDisplayControls/PassengerPreArrivalControl.xaml.cs

@@ -128,8 +128,7 @@ namespace ENI2.SheetDisplayControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(1); // Skip header row if present

ENI2/SheetDisplayControls/PortControl.xaml.cs

@@ -520,8 +520,7 @@ namespace ENI2.SheetDisplayControls
             {
                 try
                 {
-                    using (var stream = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    using (var workbook = new XLWorkbook(ofd.FileName))
-                    using (var workbook = new XLWorkbook(stream))
                     {
                         var worksheet = workbook.Worksheet(1); // Get first worksheet
                         var rows = worksheet.RangeUsed().RowsUsed().Skip(3); // Skip first three rows

bsmd.ExcelReadService/ExcelReader.cs

@@ -36,23 +36,7 @@ namespace bsmd.ExcelReadService
             this._excelApp.DisplayAlerts = false;
             this._excelWorkbooks = _excelApp.Workbooks;
             
-            this._portcall = _excelWorkbooks.Open(
+            this._portcall = _excelWorkbooks.Open(filePath, 0, true, 5, "", "", false, XlPlatform.xlWindows, "", false, false, 0, false, false, false);
-                filePath,
-                UpdateLinks: 0,
-                ReadOnly: true,
-                Format: 5,
-                Password: "",
-                WriteResPassword: "",
-                IgnoreReadOnlyRecommended: true,
-                Origin: XlPlatform.xlWindows,
-                Delimiter: "",
-                Editable: false,
-                Notify: false,
-                Converter: 0,
-                AddToMru: false,
-                Local: false,
-                CorruptLoad: false);
-            this._portcall.ChangeFileAccess(XlFileAccess.xlReadOnly);
             _nameDict = new Dictionary<string, Name>();
             int bookCnt = 0;
             foreach(Name name in _portcall.Names)

bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.2.14")]
+[assembly: AssemblyInformationalVersion("7.2.13")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2025 schick Informatik")]
 [assembly: AssemblyTrademark("")]

bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.2.14.*")]
+[assembly: AssemblyVersion("7.2.13.*")]