Skip to content
Snippets Groups Projects
Commit 8e6812d8 authored by Thomas Mortagne's avatar Thomas Mortagne
Browse files

XWIKI-13256: Viewing a PPT / ODP with the Office Macro fails when on a nested page

    XWIKI-13748: Save embedded images that use Data URI as attachments when importing an office document
    * use code compatible with Java 7
parent 443e3964
No related branches found
No related tags found
No related merge requests found
...@@ -151,7 +151,7 @@ public void build() throws Exception ...@@ -151,7 +151,7 @@ public void build() throws Exception
Assert.assertEquals(galleryContent, macros.get(0).getChildren().get(0)); Assert.assertEquals(galleryContent, macros.get(0).getChildren().get(0));
} }
private Answer<Document> returnMatchingDocument(String content, Document document) private Answer<Document> returnMatchingDocument(final String content, final Document document)
{ {
return new Answer<Document>() return new Answer<Document>()
{ {
......
...@@ -58,7 +58,7 @@ public void configure() throws Exception ...@@ -58,7 +58,7 @@ public void configure() throws Exception
protected Document filter(String content) protected Document filter(String content)
{ {
return filter(content, Collections.emptyMap()); return filter(content, Collections.<String, String>emptyMap());
} }
protected Document filter(String content, Map<String, String> cleaningParameters) protected Document filter(String content, Map<String, String> cleaningParameters)
...@@ -73,7 +73,7 @@ protected Document filter(String content, Map<String, String> cleaningParameters ...@@ -73,7 +73,7 @@ protected Document filter(String content, Map<String, String> cleaningParameters
protected Document filterAndAssertOutput(String input, String expectedOuput) protected Document filterAndAssertOutput(String input, String expectedOuput)
{ {
return filterAndAssertOutput(input, Collections.emptyMap(), expectedOuput); return filterAndAssertOutput(input, Collections.<String, String>emptyMap(), expectedOuput);
} }
protected Document filterAndAssertOutput(String input, Map<String, String> cleaningParameters, String expectedOuput) protected Document filterAndAssertOutput(String input, Map<String, String> cleaningParameters, String expectedOuput)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment