From 2f9291a03b7707ce33c8d4adc041fb1bb58438dd Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Tue, 4 Oct 2016 12:38:32 +0200
Subject: [PATCH] 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
---
.../office/viewer/internal/DefaultOfficeResourceViewer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/src/main/java/org/xwiki/office/viewer/internal/DefaultOfficeResourceViewer.java b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/src/main/java/org/xwiki/office/viewer/internal/DefaultOfficeResourceViewer.java
index 2bd1f75c870..3a6fc3b89de 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/src/main/java/org/xwiki/office/viewer/internal/DefaultOfficeResourceViewer.java
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/src/main/java/org/xwiki/office/viewer/internal/DefaultOfficeResourceViewer.java
@@ -227,7 +227,7 @@ private void maybeFixExpandedMacroAncestor(Block block)
if (expandedMacro != null) {
Block parent = expandedMacro.getParent();
if (!(parent instanceof MetaDataBlock) || !((MetaDataBlock) parent).getMetaData().contains(MODULE_NAME)) {
- MetaDataBlock metaData = new MetaDataBlock(Collections.emptyList());
+ MetaDataBlock metaData = new MetaDataBlock(Collections.<Block>emptyList());
// Use a syntax that supports relative path resource references (we use relative paths to include the
// temporary files).
metaData.getMetaData().addMetaData(MetaData.SYNTAX, Syntax.XWIKI_2_1);
--
GitLab