From c436ff287268341131c7136ad75ac6677857e75b Mon Sep 17 00:00:00 2001 From: Erik Knizat Date: Wed, 8 Apr 2020 10:44:33 +0100 Subject: [PATCH] Reenable libreoffice --- .../main/java/org/alfresco/transformer/AIOCustomConfig.java | 3 ++- .../alfresco/transformer/transformers/LibreOfficeAdapter.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java index b29f4e76..db89c6ec 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java @@ -28,6 +28,7 @@ package org.alfresco.transformer; import org.alfresco.transform.client.registry.TransformServiceRegistry; import org.alfresco.transformer.transformers.ImageMagickAdapter; +import org.alfresco.transformer.transformers.LibreOfficeAdapter; import org.alfresco.transformer.transformers.MiscAdapter; import org.alfresco.transformer.transformers.PdfRendererAdapter; import org.alfresco.transformer.transformers.TikaAdapter; @@ -50,7 +51,7 @@ public class AIOCustomConfig aioTransformRegistry.registerTransformer(new MiscAdapter()); aioTransformRegistry.registerTransformer(new TikaAdapter()); aioTransformRegistry.registerTransformer(new ImageMagickAdapter()); - //aioTransformRegistry.registerTransformer(new LibreOfficeAdapter()); // TODO - why did this start throwing NPE - should we catch them? + aioTransformRegistry.registerTransformer(new LibreOfficeAdapter()); aioTransformRegistry.registerTransformer(new PdfRendererAdapter()); return aioTransformRegistry; } diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java index 5c9d40fe..aad346be 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/transformers/LibreOfficeAdapter.java @@ -38,6 +38,7 @@ public class LibreOfficeAdapter implements Transformer public LibreOfficeAdapter() throws Exception { + super(); javaExecutor = new LibreOfficeJavaExecutor(); }