From d248af269fcde332ff1023cee73a4833411a7e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20M=C3=A9riot?= Date: Tue, 29 Aug 2017 18:30:17 +0200 Subject: [PATCH] fix(ooxml): regexp does not replace the whole tag in every case MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Mériot --- .../main/java/xyz/docbleach/module/ooxml/OOXMLTagHelper.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/module/module-office/src/main/java/xyz/docbleach/module/ooxml/OOXMLTagHelper.java b/module/module-office/src/main/java/xyz/docbleach/module/ooxml/OOXMLTagHelper.java index dd88092e..ae5867b4 100644 --- a/module/module-office/src/main/java/xyz/docbleach/module/ooxml/OOXMLTagHelper.java +++ b/module/module-office/src/main/java/xyz/docbleach/module/ooxml/OOXMLTagHelper.java @@ -9,7 +9,6 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import org.apache.poi.openxml4j.exceptions.InvalidOperationException; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.ZipPackagePart; import org.slf4j.Logger; @@ -30,8 +29,8 @@ public class OOXMLTagHelper { private static final String XML_EXTENSION = "xml"; private static final String XML_COMMENT_BLEACHED = ""; private static final String TAG_EXTERNAL_DATA = "externalData"; - /** The regexp try to catch the whole tag, including namespace and attributes */ - private static final String REGEXP_EXTERNAL_DATA = "<.." + TAG_EXTERNAL_DATA + ".*?/>"; + /** The regexp tries to catch the whole tag, including namespace and attributes (...) */ + private static final String REGEXP_EXTERNAL_DATA = "<.." + TAG_EXTERNAL_DATA + "(.*|.*?/>)"; private OOXMLTagHelper() { }