diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-05-08 15:01:22 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-09 00:45:32 +0200 |
commit | cc68977f1be22ac0f4a15eb37e05ccba13a7a554 (patch) | |
tree | 4ca281b1448cac3db57c2c4f155d041def8009ca /include | |
parent | b511cf5bae10689f85048c01b18f85c436742690 (diff) |
OFFICE-3776 xmloff: adapt ODF import to renamed text:sender-initialslibreoffice-5-4
ODF TC decided to rename the element to meta:creator-initials, so adapt
the import so it can read this in addition to the 2 element names
produced by current and past LO versions.
Also add a test.
Unfortunately it turned out that the ODF validator had a bug in checking
character data in foreign elements, which is triggered by the test
document, see https://issues.apache.org/jira/browse/ODFTOOLKIT-475
... so update the validator jar as well.
Change-Id: I1de1e8772b41f8937f043d9a0d150e169f25ffd4
Reviewed-on: https://gerrit.libreoffice.org/53979
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit b09889a158cbc839ebc8a6061b0b261fa74930e6)
Reviewed-on: https://gerrit.libreoffice.org/54007
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/xmloff/xmltoken.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx index 2fee08b63871..a88b5a9132a8 100644 --- a/include/xmloff/xmltoken.hxx +++ b/include/xmloff/xmltoken.hxx @@ -3295,6 +3295,8 @@ namespace xmloff { namespace token { XML_ZEROS_DENOMINATOR_DIGITS, XML_INTEGER_FRACTION_DELIMITER, + XML_CREATOR_INITIALS, + XML_TOKEN_END }; |