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

(cherry picked from commit 8e6812d8)

xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/src/test/java/org/xwiki/officeimporter/internal/builder/DefaultPresentationBuilderTest.java

@@ -151,7 +151,7 @@ public void build() throws Exception
         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>()
         {

xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/src/test/java/org/xwiki/officeimporter/internal/filter/AbstractHTMLFilterTest.java

@@ -58,7 +58,7 @@ public void configure() throws Exception
 
     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)
@@ -73,7 +73,7 @@ protected Document filter(String content, Map<String, String> cleaningParameters
 
     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)