From 5cc25607ce0f349218a3b7e0d04888193ff1ad10 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 6 Sep 2024 11:05:25 +0200 Subject: [PATCH] Fixes #319: validator: the generator element is in meta.xml Apparently this was always wrong, and nobody used -g? --- .../java/org/odftoolkit/odfvalidator/MetaInformation.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/validator/src/main/java/org/odftoolkit/odfvalidator/MetaInformation.java b/validator/src/main/java/org/odftoolkit/odfvalidator/MetaInformation.java index 4f3116b72c..7093ab4f13 100644 --- a/validator/src/main/java/org/odftoolkit/odfvalidator/MetaInformation.java +++ b/validator/src/main/java/org/odftoolkit/odfvalidator/MetaInformation.java @@ -28,6 +28,7 @@ import java.io.PrintStream; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.odftoolkit.odfdom.dom.OdfSchemaDocument; import org.odftoolkit.odfdom.pkg.OdfPackage; import org.xml.sax.InputSource; import org.xml.sax.XMLFilter; @@ -54,11 +55,12 @@ public void getInformation(String aDocFileName) throws ODFValidatorException { public void getGenerator(OdfPackage aDocFile) throws ODFValidatorException { try { - InputStream aInStream = aDocFile.getInputStream(OdfPackage.OdfFile.MANIFEST.getPath(), true); + InputStream aInStream = + aDocFile.getInputStream(OdfSchemaDocument.OdfXMLFile.META.getFileName(), true); Logger aLogger = new Logger( aDocFile.getBaseURI(), - OdfPackage.OdfFile.MANIFEST.getPath(), + OdfSchemaDocument.OdfXMLFile.META.getFileName(), m_aOut, Logger.LogLevel.INFO);