-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/document-and-document-templates
- Loading branch information
Showing
10 changed files
with
97 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using System.Xml.Linq; | ||
| using static System.Runtime.InteropServices.JavaScript.JSType; | ||
|
|
||
| namespace Clippit.Word.Assembler | ||
| { | ||
| internal static class XElementExtensions | ||
| { | ||
| internal static void MergeRunProperties( | ||
| this XElement element, | ||
| XElement paraRunProperties, | ||
| XElement runRunProperties | ||
| ) | ||
| { | ||
| // merge run properties of paragraph properties | ||
| if (element.Name == W.p && paraRunProperties != null) | ||
| { | ||
| XElement paraProps = element.Elements(W.pPr).FirstOrDefault(); | ||
| if (paraProps != null) | ||
| { | ||
| XElement paraRunProps = paraProps.Elements(W.rPr).FirstOrDefault(); | ||
| if (paraRunProps == null) | ||
| { | ||
| paraProps.Add(paraRunProperties); | ||
| } | ||
| else | ||
| { | ||
| paraRunProps.MergeOriginalRunProperties(paraRunProperties); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // merge run properties of runs | ||
| if (runRunProperties != null) | ||
| { | ||
| foreach (var run in element.DescendantsAndSelf(W.r)) | ||
| { | ||
| XElement runProps = run.Elements(W.rPr).FirstOrDefault(); | ||
| if (runProps == null) | ||
| { | ||
| run.AddFirst(runRunProperties); | ||
| } | ||
| else | ||
| { | ||
| runProps.MergeOriginalRunProperties(runRunProperties); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private static void MergeOriginalRunProperties(this XElement runProps, XElement originalRunProps) | ||
| { | ||
| foreach (var prop in originalRunProps.Elements()) | ||
| { | ||
| if (runProps.Element(prop.Name) == null) | ||
| { | ||
| if (prop.Name == W.rStyle) | ||
| { | ||
| runProps.AddFirst(prop); | ||
| } | ||
| else | ||
| { | ||
| runProps.Add(prop); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <Doc> | ||
| <TestCase>1000101</TestCase> | ||
| <Name>TestCustomer</Name> | ||
| <CDATA><![CDATA[Testing Data]]></CDATA> | ||
| <EscapedHTML>TestURL</EscapedHTML> | ||
| </Doc> |
Binary file not shown.
Binary file not shown.
Binary file not shown.