Stream Bug Fix

DraviaVemal · Apr 20, 2024 · 1a1acc8 · 1a1acc8
1 parent b29427a
commit 1a1acc8
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 68 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -15,7 +15,7 @@
         <LangVersion>5.0</LangVersion>
         <OutputPath>..\bin\</OutputPath>
         <Authors>DraviaVemal</Authors>
-        <Version>2.6.22</Version>
+        <Version>2.6.23</Version>
         <Company>DraviaVemal</Company>
         <Copyright>Copyright (c) 2023 DraviaVemal
             Permission is hereby granted, free of charge, to any person obtaining a copy of this

diff --git a/Presentation/Internal/PresentationCore.cs b/Presentation/Internal/PresentationCore.cs
@@ -20,48 +20,42 @@ internal class PresentationCore
 		public PresentationCore(PowerPointProperties presentationProperties = null)
 		{
 			this.presentationProperties = presentationProperties ?? new PowerPointProperties();
-			using (MemoryStream memoryStream = new MemoryStream())
-			{
-				presentationDocument = PresentationDocument.Create(memoryStream, PresentationDocumentType.Presentation, true);
-				InitialisePresentation(this.presentationProperties);
-			}
+			MemoryStream memoryStream = new MemoryStream();
+			presentationDocument = PresentationDocument.Create(memoryStream, PresentationDocumentType.Presentation, true);
+			InitialisePresentation(this.presentationProperties);
 		}
 		public PresentationCore(string filePath, bool isEditable = true, PowerPointProperties presentationProperties = null)
 		{
 			presentationInfo.isEditable = isEditable;
 			this.presentationProperties = presentationProperties ?? new PowerPointProperties();
 			FileStream reader = new FileStream(filePath, FileMode.Open);
-			using (MemoryStream memoryStream = new MemoryStream())
+			MemoryStream memoryStream = new MemoryStream();
+			reader.CopyTo(memoryStream);
+			reader.Close();
+			presentationDocument = PresentationDocument.Open(memoryStream, isEditable, new OpenSettings()
 			{
-				reader.CopyTo(memoryStream);
-				reader.Close();
-				presentationDocument = PresentationDocument.Open(memoryStream, isEditable, new OpenSettings()
-				{
-					AutoSave = true
-				});
-				if (presentationInfo.isEditable)
-				{
-					InitialisePresentation(this.presentationProperties);
-					presentationInfo.isExistingFile = true;
-				}
+				AutoSave = true
+			});
+			if (presentationInfo.isEditable)
+			{
+				InitialisePresentation(this.presentationProperties);
+				presentationInfo.isExistingFile = true;
 			}
 		}
 		internal PresentationCore(Stream stream, bool isEditable = true, PowerPointProperties presentationProperties = null)
 		{
 			presentationInfo.isEditable = isEditable;
 			this.presentationProperties = presentationProperties ?? new PowerPointProperties();
-			using (MemoryStream memoryStream = new MemoryStream())
+			MemoryStream memoryStream = new MemoryStream();
+			stream.CopyTo(memoryStream);
+			stream.Dispose();
+			presentationDocument = PresentationDocument.Open(memoryStream, isEditable, new OpenSettings()
 			{
-				stream.CopyTo(memoryStream);
-				stream.Dispose();
-				presentationDocument = PresentationDocument.Open(memoryStream, isEditable, new OpenSettings()
-				{
-					AutoSave = true
-				});
-				if (presentationInfo.isEditable)
-				{
-					InitialisePresentation(this.presentationProperties);
-				}
+				AutoSave = true
+			});
+			if (presentationInfo.isEditable)
+			{
+				InitialisePresentation(this.presentationProperties);
 			}
 		}
 		internal string GetNextPresentationRelationId()

diff --git a/Spreadsheet/Internal/SpreadsheetCore.cs b/Spreadsheet/Internal/SpreadsheetCore.cs
@@ -23,60 +23,54 @@ internal SpreadsheetCore(Excel excel, ExcelProperties spreadsheetProperties = nu
 		{
 			this.excel = excel;
 			this.spreadsheetProperties = spreadsheetProperties ?? new ExcelProperties();
-			using (MemoryStream memoryStream = new MemoryStream())
-			{
-				spreadsheetDocument = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook, true);
-				InitialiseSpreadsheet(this.spreadsheetProperties);
-			}
+			MemoryStream memoryStream = new MemoryStream();
+			spreadsheetDocument = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook, true);
+			InitialiseSpreadsheet(this.spreadsheetProperties);
 		}
 		internal SpreadsheetCore(Excel excel, string filePath, bool isEditable, ExcelProperties spreadsheetProperties = null)
 		{
 			this.excel = excel;
 			this.spreadsheetProperties = spreadsheetProperties ?? new ExcelProperties();
 			FileStream reader = new FileStream(filePath, FileMode.Open);
-			using (MemoryStream memoryStream = new MemoryStream())
+			MemoryStream memoryStream = new MemoryStream();
+			reader.CopyTo(memoryStream);
+			reader.Close();
+			spreadsheetDocument = SpreadsheetDocument.Open(memoryStream, isEditable, new OpenSettings()
 			{
-				reader.CopyTo(memoryStream);
-				reader.Close();
-				spreadsheetDocument = SpreadsheetDocument.Open(memoryStream, isEditable, new OpenSettings()
-				{
-					AutoSave = true
-				});
-				if (isEditable)
-				{
-					spreadsheetInfo.isExistingFile = true;
-					InitialiseSpreadsheet(this.spreadsheetProperties);
-				}
-				else
-				{
-					spreadsheetInfo.isEditable = false;
-				}
-				ReadDataFromFile();
+				AutoSave = true
+			});
+			if (isEditable)
+			{
+				spreadsheetInfo.isExistingFile = true;
+				InitialiseSpreadsheet(this.spreadsheetProperties);
 			}
+			else
+			{
+				spreadsheetInfo.isEditable = false;
+			}
+			ReadDataFromFile();
 		}
 		internal SpreadsheetCore(Excel excel, Stream stream, bool isEditable, ExcelProperties spreadsheetProperties = null)
 		{
 			this.excel = excel;
 			this.spreadsheetProperties = spreadsheetProperties ?? new ExcelProperties();
-			using (MemoryStream memoryStream = new MemoryStream())
+			MemoryStream memoryStream = new MemoryStream();
+			stream.CopyTo(memoryStream);
+			stream.Dispose();
+			spreadsheetDocument = SpreadsheetDocument.Open(memoryStream, isEditable, new OpenSettings()
 			{
-				stream.CopyTo(memoryStream);
-				stream.Dispose();
-				spreadsheetDocument = SpreadsheetDocument.Open(memoryStream, isEditable, new OpenSettings()
-				{
-					AutoSave = true
-				});
-				if (isEditable)
-				{
-					spreadsheetInfo.isExistingFile = true;
-					InitialiseSpreadsheet(this.spreadsheetProperties);
-				}
-				else
-				{
-					spreadsheetInfo.isEditable = false;
-				}
-				ReadDataFromFile();
+				AutoSave = true
+			});
+			if (isEditable)
+			{
+				spreadsheetInfo.isExistingFile = true;
+				InitialiseSpreadsheet(this.spreadsheetProperties);
+			}
+			else
+			{
+				spreadsheetInfo.isEditable = false;
 			}
+			ReadDataFromFile();
 		}
 		/// <summary>
 		/// Read Data from exiting file