Skip to content

Commit 57396af

Browse files
authored
Merge pull request #68 from ping9719/main
适配新OpenXml,解决换行为多行的问题
2 parents 14a7195 + 27af02a commit 57396af

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/MiniWord/MiniWord.Implment.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,16 +473,16 @@ private static void ReplaceText(OpenXmlElement xmlElement, WordprocessingDocumen
473473
}
474474
}
475475
}
476-
476+
477477
t.Text = EvaluateIfStatement(t.Text);
478-
478+
479479
// add breakline
480480
{
481481
var newText = t.Text;
482-
var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n)");
482+
var splits = Regex.Split(newText, "(<[a-zA-Z/].*?>|\n|\r\n)").Where(o => o != "\n" && o != "\r\n");
483483
var currentT = t;
484484
var isFirst = true;
485-
if (splits.Length > 1)
485+
if (splits.Count() > 1)
486486
{
487487
foreach (var v in splits)
488488
{

src/MiniWord/MiniWord.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;netstandard2.0;net5.0</TargetFrameworks>
3+
<TargetFrameworks>net45;netstandard2.0;</TargetFrameworks>
44
<Version>0.7.1</Version>
55
</PropertyGroup>
66
<PropertyGroup>
@@ -32,6 +32,6 @@
3232
<None Include="icon.png" Pack="true" PackagePath="\" />
3333
</ItemGroup>
3434
<ItemGroup>
35-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.18.0" />
35+
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.1" />
3636
</ItemGroup>
3737
</Project>

src/MiniWord/MiniWordPicture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public string Extension
2424
}
2525
set { _extension = value; }
2626
}
27-
internal ImagePartType GetImagePartType
27+
internal PartTypeInfo GetImagePartType
2828
{
2929
get
3030
{

0 commit comments

Comments
 (0)