Skip to content

MAINT: Minor typos and merge commits #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlwilson merged 6 commits into from
Nov 13, 2025
Merged

MAINT: Minor typos and merge commits #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9bd85c
Merge pull request #269 from openpreserve/fix/cache-memory
carlwilson Nov 11, 2025
da858cf
Fixed minor spacing typo.
carlwilson Nov 13, 2025
439ccae
Update odf-core/src/test/resources/org/openpreservation/odf/fmt/xml/e…
carlwilson Nov 13, 2025
3fd8d54
Update odf-core/src/main/java/org/openpreservation/odf/validation/Odf…
carlwilson Nov 13, 2025
898e543
Merge pull request #270 from openpreserve/feat/extended-conformance
carlwilson Nov 13, 2025
ee57acf
Merge pull request #272 from openpreserve/dev/1.18.5
carlwilson Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion odf-core/src/main/java/org/openpreservation/odf/validation/OdfValidators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public static final ValidatingParser getValidatingParser() throws ParserConfigur
/**
* Get either an extended or non-extended validating parser instance.
*
* @return a validating parser instance
* @param isExtended whether to enable extended validation/conformance
* @return a validating parser instance
* @throws ParserConfigurationException
* @throws SAXException
*/
Expand Down
2 changes: 1 addition & 1 deletion odf-core/src/main/java/org/openpreservation/odf/validation/ValidatingParserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private final List<Message> validateOdfXmlDocument(final OdfPackage odfPackage,
this.results.put(xmlPath, validationResult);
} catch (IOException e) {
messageList.add(FACTORY.getError("CORE-3", Messages.parameterListInstance().add("message", e.getMessage()).add("xmlPath", xmlPath)));
} catch (SAXException |ParserConfigurationException e) {
} catch (SAXException | ParserConfigurationException e) {
messageList.add(FACTORY.getError("CORE-4", Messages.parameterListInstance().add("message", e.getMessage()).add("xmlPath", xmlPath)));
}
}
Expand Down
2 changes: 1 addition & 1 deletion odf-core/src/test/resources/org/openpreservation/odf/fmt/xml/extended_invalid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</table:table-row>
<table:table-row table:style-name="ro2">
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Embeded object as icon</text:p>
<text:p>Embedded object as icon</text:p>
</table:table-cell>
</table:table-row>
<table:table-row table:style-name="ro2" table:number-rows-repeated="3">
Expand Down