Merge pull request #68 from ping9719/main

适配新OpenXml，解决换行为多行的问题
mini-software · Feb 19, 2024 · 57396af · 57396af
2 parents 14a7195 + 27af02a
commit 57396af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/MiniWord/MiniWord.Implment.cs b/src/MiniWord/MiniWord.Implment.cs
@@ -473,16 +473,16 @@ private static void ReplaceText(OpenXmlElement xmlElement, WordprocessingDocumen
                                 }
                             }
                         }
-                        
+
                         t.Text = EvaluateIfStatement(t.Text);
-                        
+
                         // add breakline
                         {
                             var newText = t.Text;
-                            var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n)");
+                            var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n|\r\n)").Where(o => o != "\n" && o != "\r\n");
                             var currentT = t;
                             var isFirst = true;
-                            if (splits.Length > 1)
+                            if (splits.Count() > 1)
                             {
                                 foreach (var v in splits)
                                 {

diff --git a/src/MiniWord/MiniWord.csproj b/src/MiniWord/MiniWord.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
+		<TargetFrameworks>net45;netstandard2.0;</TargetFrameworks>
 		<Version>0.7.1</Version>
 	</PropertyGroup>
 	<PropertyGroup>
@@ -32,6 +32,6 @@
 		<None Include="icon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="DocumentFormat.OpenXml" Version="2.18.0" />
+		<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/MiniWord/MiniWordPicture.cs b/src/MiniWord/MiniWordPicture.cs
@@ -24,7 +24,7 @@ public string Extension
             }
             set { _extension = value; }
         }
-        internal ImagePartType GetImagePartType
+        internal PartTypeInfo GetImagePartType
         {
             get
             {
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ public string Extension @@
                 }
                 set { _extension = value; }
             }
-            internal ImagePartType GetImagePartType
+            internal PartTypeInfo GetImagePartType
             {
                 get
                 {
@@ Expand Down @@