From 234962be06aa8c54b4942cd49ff839b0d8344392 Mon Sep 17 00:00:00 2001 From: Tony Qu Date: Mon, 6 May 2024 07:54:29 +0800 Subject: [PATCH 1/5] fix #1196 --- ooxml/POIXMLDocument.cs | 4 ++-- ooxml/Util/PackageHelper.cs | 4 ++-- ooxml/XSSF/UserModel/XSSFWorkbook.cs | 10 +++++----- openxml4Net/OPC/OPCPackage.cs | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ooxml/POIXMLDocument.cs b/ooxml/POIXMLDocument.cs index c8a069c64..67d4f14c4 100644 --- a/ooxml/POIXMLDocument.cs +++ b/ooxml/POIXMLDocument.cs @@ -68,11 +68,11 @@ private void init(OPCPackage pkg) * in the event of a problem. * Works around shortcomings in java's this() constructor calls */ - public static OPCPackage OpenPackage(String path) + public static OPCPackage OpenPackage(String path, bool bReadOnly=false) { try { - return OPCPackage.Open(path); + return OPCPackage.Open(path, bReadOnly? PackageAccess.READ: PackageAccess.READ_WRITE); } catch (InvalidFormatException e) { diff --git a/ooxml/Util/PackageHelper.cs b/ooxml/Util/PackageHelper.cs index 9c3acc602..357003aac 100644 --- a/ooxml/Util/PackageHelper.cs +++ b/ooxml/Util/PackageHelper.cs @@ -31,11 +31,11 @@ namespace NPOI.Util public class PackageHelper { - public static OPCPackage Open(Stream is1) + public static OPCPackage Open(Stream stream, bool bReadonly = false) { try { - return OPCPackage.Open(is1); + return OPCPackage.Open(stream, bReadonly); } catch (InvalidFormatException e) { diff --git a/ooxml/XSSF/UserModel/XSSFWorkbook.cs b/ooxml/XSSF/UserModel/XSSFWorkbook.cs index e7619bb20..1ab8c14a8 100644 --- a/ooxml/XSSF/UserModel/XSSFWorkbook.cs +++ b/ooxml/XSSF/UserModel/XSSFWorkbook.cs @@ -230,8 +230,8 @@ public XSSFWorkbook(OPCPackage pkg) * pkg.close(); // gracefully closes the underlying zip file * */ - public XSSFWorkbook(Stream is1) - : base(PackageHelper.Open(is1)) + public XSSFWorkbook(Stream fileStream, bool bReadonly=false) + : base(PackageHelper.Open(fileStream, bReadonly)) { BeforeDocumentRead(); @@ -259,8 +259,8 @@ public XSSFWorkbook(Stream is1) * * @param file the file to open */ - public XSSFWorkbook(FileInfo file) - : this(OPCPackage.Open(file)) + public XSSFWorkbook(FileInfo file, bool bReadonly = false) + : this(OPCPackage.Open(file, bReadonly? PackageAccess.READ: PackageAccess.READ_WRITE)) { } @@ -301,7 +301,7 @@ public XSSFWorkbook(FileInfo file) * * @param path the file name. */ - public XSSFWorkbook(String path) + public XSSFWorkbook(String path, bool bReadonly=false) : this(OpenPackage(path)) { diff --git a/openxml4Net/OPC/OPCPackage.cs b/openxml4Net/OPC/OPCPackage.cs index 327fb58e0..6d9d7c46f 100644 --- a/openxml4Net/OPC/OPCPackage.cs +++ b/openxml4Net/OPC/OPCPackage.cs @@ -294,9 +294,9 @@ public static OPCPackage Open(FileInfo file, PackageAccess access) * The InputStream to read the package from * @return A PackageBase object */ - public static OPCPackage Open(Stream in1) + public static OPCPackage Open(Stream stream) { - OPCPackage pack = new ZipPackage(in1, PackageAccess.READ_WRITE); + OPCPackage pack = new ZipPackage(stream, PackageAccess.READ_WRITE); try { if (pack.partList == null) @@ -317,9 +317,9 @@ public static OPCPackage Open(Stream in1) return pack; } - public static OPCPackage Open(Stream in1,bool bReadonly) + public static OPCPackage Open(Stream stream,bool bReadonly) { - OPCPackage pack = new ZipPackage(in1, bReadonly ? PackageAccess.READ : PackageAccess.READ_WRITE); + OPCPackage pack = new ZipPackage(stream, bReadonly ? PackageAccess.READ : PackageAccess.READ_WRITE); if (pack.partList == null) { pack.GetParts(); From 795500e4286e8290527bb6df25053adeac0818c7 Mon Sep 17 00:00:00 2001 From: Tony Qu Date: Mon, 6 May 2024 08:33:53 +0800 Subject: [PATCH 2/5] trigger GitHub actions From 150789bbcc9d0f0e08b756f5303a222f584b5da5 Mon Sep 17 00:00:00 2001 From: Tony Qu Date: Tue, 7 May 2024 05:49:50 +0800 Subject: [PATCH 3/5] change formatting --- ooxml/Util/PackageHelper.cs | 5 ++--- ooxml/XSSF/UserModel/XSSFWorkbook.cs | 8 ++++---- openxml4Net/OPC/OPCPackage.cs | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ooxml/Util/PackageHelper.cs b/ooxml/Util/PackageHelper.cs index 357003aac..df29d079a 100644 --- a/ooxml/Util/PackageHelper.cs +++ b/ooxml/Util/PackageHelper.cs @@ -30,12 +30,11 @@ namespace NPOI.Util */ public class PackageHelper { - - public static OPCPackage Open(Stream stream, bool bReadonly = false) + public static OPCPackage Open(Stream stream, bool readOnly = false) { try { - return OPCPackage.Open(stream, bReadonly); + return OPCPackage.Open(stream, readOnly); } catch (InvalidFormatException e) { diff --git a/ooxml/XSSF/UserModel/XSSFWorkbook.cs b/ooxml/XSSF/UserModel/XSSFWorkbook.cs index 1ab8c14a8..7b05ee48a 100644 --- a/ooxml/XSSF/UserModel/XSSFWorkbook.cs +++ b/ooxml/XSSF/UserModel/XSSFWorkbook.cs @@ -230,8 +230,8 @@ public XSSFWorkbook(OPCPackage pkg) * pkg.close(); // gracefully closes the underlying zip file * */ - public XSSFWorkbook(Stream fileStream, bool bReadonly=false) - : base(PackageHelper.Open(fileStream, bReadonly)) + public XSSFWorkbook(Stream fileStream, bool readOnly = false) + : base(PackageHelper.Open(fileStream, readOnly)) { BeforeDocumentRead(); @@ -259,8 +259,8 @@ public XSSFWorkbook(Stream fileStream, bool bReadonly=false) * * @param file the file to open */ - public XSSFWorkbook(FileInfo file, bool bReadonly = false) - : this(OPCPackage.Open(file, bReadonly? PackageAccess.READ: PackageAccess.READ_WRITE)) + public XSSFWorkbook(FileInfo file, bool readOnly = false) + : this(OPCPackage.Open(file, readOnly? PackageAccess.READ: PackageAccess.READ_WRITE)) { } diff --git a/openxml4Net/OPC/OPCPackage.cs b/openxml4Net/OPC/OPCPackage.cs index 6d9d7c46f..6443d72cc 100644 --- a/openxml4Net/OPC/OPCPackage.cs +++ b/openxml4Net/OPC/OPCPackage.cs @@ -317,9 +317,9 @@ public static OPCPackage Open(Stream stream) return pack; } - public static OPCPackage Open(Stream stream,bool bReadonly) + public static OPCPackage Open(Stream stream,bool readOnly) { - OPCPackage pack = new ZipPackage(stream, bReadonly ? PackageAccess.READ : PackageAccess.READ_WRITE); + OPCPackage pack = new ZipPackage(stream, readOnly ? PackageAccess.READ : PackageAccess.READ_WRITE); if (pack.partList == null) { pack.GetParts(); From 58f28528d3bceacad9c1d5db5b57576a275710cf Mon Sep 17 00:00:00 2001 From: Tony Qu Date: Tue, 7 May 2024 05:54:00 +0800 Subject: [PATCH 4/5] change formatting of bReadOnly --- ooxml/POIXMLDocument.cs | 4 ++-- ooxml/SS/UserModel/WorkbookFactory.cs | 4 ++-- ooxml/XSSF/UserModel/XSSFWorkbook.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ooxml/POIXMLDocument.cs b/ooxml/POIXMLDocument.cs index 67d4f14c4..222f25ce0 100644 --- a/ooxml/POIXMLDocument.cs +++ b/ooxml/POIXMLDocument.cs @@ -68,11 +68,11 @@ private void init(OPCPackage pkg) * in the event of a problem. * Works around shortcomings in java's this() constructor calls */ - public static OPCPackage OpenPackage(String path, bool bReadOnly=false) + public static OPCPackage OpenPackage(String path, bool readOnly = false) { try { - return OPCPackage.Open(path, bReadOnly? PackageAccess.READ: PackageAccess.READ_WRITE); + return OPCPackage.Open(path, readOnly ? PackageAccess.READ: PackageAccess.READ_WRITE); } catch (InvalidFormatException e) { diff --git a/ooxml/SS/UserModel/WorkbookFactory.cs b/ooxml/SS/UserModel/WorkbookFactory.cs index d6e97ebf6..bd81185c6 100644 --- a/ooxml/SS/UserModel/WorkbookFactory.cs +++ b/ooxml/SS/UserModel/WorkbookFactory.cs @@ -121,7 +121,7 @@ public static IWorkbook Create(OPCPackage pkg) /// IWorkbook depending on the input HSSFWorkbook or XSSFWorkbook is returned. /// Your input stream MUST either support mark/reset, or /// be wrapped as a {@link PushbackInputStream}! - public static IWorkbook Create(Stream inputStream, bool bReadonly) + public static IWorkbook Create(Stream inputStream, bool readOnly) { if (inputStream.Length == 0) throw new EmptyFileException(); @@ -133,7 +133,7 @@ public static IWorkbook Create(Stream inputStream, bool bReadonly) inputStream.Position = 0; if (DocumentFactoryHelper.HasOOXMLHeader(inputStream)) { - return new XSSFWorkbook(OPCPackage.Open(inputStream, bReadonly)); + return new XSSFWorkbook(OPCPackage.Open(inputStream, readOnly)); } throw new InvalidFormatException("Your stream was neither an OLE2 stream, nor an OOXML stream."); } diff --git a/ooxml/XSSF/UserModel/XSSFWorkbook.cs b/ooxml/XSSF/UserModel/XSSFWorkbook.cs index 7b05ee48a..2940dc72f 100644 --- a/ooxml/XSSF/UserModel/XSSFWorkbook.cs +++ b/ooxml/XSSF/UserModel/XSSFWorkbook.cs @@ -301,8 +301,8 @@ public XSSFWorkbook(FileInfo file, bool readOnly = false) * * @param path the file name. */ - public XSSFWorkbook(String path, bool bReadonly=false) - : this(OpenPackage(path)) + public XSSFWorkbook(String path, bool readOnly = false) + : this(OpenPackage(path, readOnly)) { } From 74c29c00e8ac018cb7ba034e283fac5857e51672 Mon Sep 17 00:00:00 2001 From: Tony Qu Date: Mon, 13 May 2024 05:36:00 +0800 Subject: [PATCH 5/5] Trigger Build