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 443e3964)

xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/src/test/java/org/xwiki/rendering/block/ExpandedMacroBlockTest.java

@@ -62,7 +62,7 @@ public void constructorCallsSuper()
     public void getContentWrapsChildNodesInXDOM()
     {
         ExpandedMacroBlock expandedMacroBlock =
-            new ExpandedMacroBlock("gallery", Collections.emptyMap(), this.contentRenderer, false);
+            new ExpandedMacroBlock("gallery", Collections.<String, String>emptyMap(), this.contentRenderer, false);
 
         expandedMacroBlock.getContent();
 
@@ -75,9 +75,9 @@ public void getContentWrapsChildNodesInXDOM()
     @Test
     public void getContentUsesChildXDOM()
     {
-        XDOM content = new XDOM(Collections.emptyList());
+        XDOM content = new XDOM(Collections.<Block>emptyList());
         ExpandedMacroBlock expandedMacroBlock =
-            new ExpandedMacroBlock("gallery", Collections.emptyMap(), this.contentRenderer, false);
+            new ExpandedMacroBlock("gallery", Collections.<String, String>emptyMap(), this.contentRenderer, false);
         expandedMacroBlock.addChild(content);
 
         expandedMacroBlock.getContent();
@@ -88,8 +88,8 @@ public void getContentUsesChildXDOM()
     @Test
     public void getContentUsesAnotherBlockRenderer() throws Exception
     {
-        ExpandedMacroBlock expandedMacroBlock = new ExpandedMacroBlock("gallery", Collections.emptyMap(),
-            this.contentRenderer, false, this.componentManager);
+        ExpandedMacroBlock expandedMacroBlock = new ExpandedMacroBlock("gallery",
+            Collections.<String, String>emptyMap(), this.contentRenderer, false, this.componentManager);
         XDOM parent = new XDOM(Collections.singletonList(expandedMacroBlock));
         parent.getMetaData().addMetaData(MetaData.SYNTAX, Syntax.MARKDOWN_1_1);