Skip to content

DocumentAssembler: Support for images #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: vNext
Choose a base branch
from
Open

DocumentAssembler: Support for images #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31cd7e5
DocumentAssembler: Support for Images
krembf Sep 19, 2017
43d0658
DocumentAssembler: Support for Images
krembf Sep 23, 2017
cd67c09
Fix for case with extra character before Image Content Control
krembf Oct 15, 2017
4f0497b
Added support for image select in header and footer
krembf Oct 18, 2017
b24e7e2
Fixed image content improperly working with # notation
krembf Nov 6, 2017
0a56e1f
Removed static class variable _docPrId for thread-safety
krembf Nov 7, 2017
2f98a2c
Corrected relative paths for image files
krembf Jul 23, 2018
e0f7a89
Corrected relative paths for image files
krembf Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion OpenXmlPowerTools.Tests/DocumentAssemblerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,44 @@ public class DaTests
[InlineData("DA264-InvalidRunLevelRepeat.docx", "DA-Data.xml", true)]
[InlineData("DA265-RunLevelRepeatWithWhiteSpaceBefore.docx", "DA-Data.xml", false)]
[InlineData("DA266-RunLevelRepeat-NoData.docx", "DA-Data.xml", true)]

[InlineData("DA267-Repeat-HorizontalAlignType.docx", "DA-Data.xml", false)]
[InlineData("DA268-Repeat-VerticalAlignType.docx", "DA-Data.xml", false)]
[InlineData("DA269-Repeat-InvalidAlignType.docx", "DA-Data.xml", true)]
[InlineData("DA270-ImageSelect.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA270A-ImageSelect.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA271-ImageSelectWithRepeat.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA271A-ImageSelectWithRepeat.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA272-ImageSelectWithRepeatHorizontalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA272A-ImageSelectWithRepeatHorizontalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA273-ImageSelectInsideTextBoxWithRepeatVerticalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA273A-ImageSelectInsideTextBoxWithRepeatVerticalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA274-ImageSelectInsideTextBoxWithRepeatHorizontalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA274A-ImageSelectInsideTextBoxWithRepeatHorizontalAlign.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA275-ImageSelectWithRepeatInvalidAlign.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA275A-ImageSelectWithRepeatInvalidAlign.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA276-ImageSelectInsideTable.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA276A-ImageSelectInsideTable.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA277-ImageSelectMissingOrInvalidPictureContent.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA277A-ImageSelectMissingOrInvalidPictureContent.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA278-ImageSelect.docx", "DA-Data-WithImagesInvalidPath.xml", true)]
[InlineData("DA278A-ImageSelect.docx", "DA-Data-WithImagesInvalidPath.xml", true)]
[InlineData("DA279-ImageSelectWithRepeat.docx", "DA-Data-WithImagesInvalidMIMEType.xml", true)]
[InlineData("DA279A-ImageSelectWithRepeat.docx", "DA-Data-WithImagesInvalidMIMEType.xml", true)]
[InlineData("DA280-ImageSelectWithRepeat.docx", "DA-Data-WithImagesInvalidImageDataFormat.xml", true)]
[InlineData("DA280A-ImageSelectWithRepeat.docx", "DA-Data-WithImagesInvalidImageDataFormat.xml", true)]
[InlineData("DA281-ImageSelectExtraWhitespaceBeforeImageContent.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA281A-ImageSelectExtraWhitespaceBeforeImageContent.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA282-ImageSelectWithHeader.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA282A-ImageSelectWithHeader.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA282-ImageSelectWithHeader.docx", "DA-Data-WithImagesInvalidPath.xml", true)]
[InlineData("DA282A-ImageSelectWithHeader.docx", "DA-Data-WithImagesInvalidPath.xml", true)]
[InlineData("DA283-ImageSelectWithFooter.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA283A-ImageSelectWithFooter.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA284-ImageSelectWithHeaderAndFooter.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA284A-ImageSelectWithHeaderAndFooter.docx", "DA-Data-WithImages.xml", false)]
[InlineData("DA285-ImageSelectNoParagraphFollowedAfterMetadata.docx", "DA-Data-WithImages.xml", true)]
[InlineData("DA285A-ImageSelectNoParagraphFollowedAfterMetadata.docx", "DA-Data-WithImages.xml", true)]

public void DA101(string name, string data, bool err)
{
DirectoryInfo sourceDir = new DirectoryInfo("../../../../TestFiles/");
Expand Down
705 changes: 697 additions & 8 deletions OpenXmlPowerTools/DocumentAssembler.cs
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions TestFiles/DA-Data-WithImages.xml
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions TestFiles/DA-Data-WithImagesInvalidImageDataFormat.xml
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions TestFiles/DA-Data-WithImagesInvalidMIMEType.xml
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions TestFiles/DA-Data-WithImagesInvalidPath.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added TestFiles/DA267-Repeat-HorizontalAlignType.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA268-Repeat-VerticalAlignType.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA269-Repeat-InvalidAlignType.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA270-ImageSelect.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA270A-ImageSelect.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA271-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA271A-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA272-ImageSelectWithRepeatHorizontalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA272A-ImageSelectWithRepeatHorizontalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA273-ImageSelectInsideTextBoxWithRepeatVerticalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA273A-ImageSelectInsideTextBoxWithRepeatVerticalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA274-ImageSelectInsideTextBoxWithRepeatHorizontalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA274A-ImageSelectInsideTextBoxWithRepeatHorizontalAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA275-ImageSelectWithRepeatInvalidAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA275A-ImageSelectWithRepeatInvalidAlign.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA276-ImageSelectInsideTable.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA276A-ImageSelectInsideTable.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA277-ImageSelectMissingOrInvalidPictureContent.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA277A-ImageSelectMissingOrInvalidPictureContent.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA278-ImageSelect.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA278A-ImageSelect.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA279-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA279A-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA280-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA280A-ImageSelectWithRepeat.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA281-ImageSelectExtraWhitespaceBeforeImageContent.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA281A-ImageSelectExtraWhitespaceBeforeImageContent.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA282-ImageSelectWithHeader.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA282A-ImageSelectWithHeader.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA283-ImageSelectWithFooter.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA283A-ImageSelectWithFooter.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA284-ImageSelectWithHeaderAndFooter.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA284A-ImageSelectWithHeaderAndFooter.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA285-ImageSelectNoParagraphFollowedAfterMetadata.docx
View file
Open in desktop
Binary file not shown.
Binary file added TestFiles/DA285A-ImageSelectNoParagraphFollowedAfterMetadata.docx
View file
Open in desktop
Binary file not shown.