[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/xmloff xmloff/source

[himajin100000 (via logerrit)]

 include/xmloff/xmltoken.hxx     |    3 ++-
 xmloff/source/core/xmltoken.cxx |    3 ++-
 xmloff/source/token/tokens.txt  |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d6c54d439e35e90dc51ddcbe2e0701ee22a5b9e1
Author:     himajin100000 <himajin100000 at gmail.com>
AuthorDate: Tue May 19 14:32:52 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri May 22 18:50:33 2020 +0200

    meta:non-whitespace-character-count attribute is known
    also, fixed a typo and re-positioned the item to the correct index.
    
    Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit acfd959f0b4069b74e76213e4118af9827005fff)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94460

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 1175958548ff..b5105e5da0f3 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1315,8 +1315,8 @@ namespace xmloff { namespace token {
         XML_NOEMPTY,
         XML_NOHREF,
         XML_NOMATCH,
+        XML_NON_WHITESPACE_CHARACTER_COUNT,
         XML_NONE,
-        XML_NOPRTSUBSET,
         XML_NORMAL,
         XML_NORMALS_DIRECTION,
         XML_NORMALS_KIND,
@@ -1326,6 +1326,7 @@ namespace xmloff { namespace token {
         XML_NOTE,
         XML_NOTES,
         XML_NOTIN,
+        XML_NOTPRSUBSET,
         XML_NOTSUBSET,
         XML_NULL_DATE,
         XML_NULL_YEAR,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index e0f6e4d7a216..fb760c6307c5 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1317,8 +1317,8 @@ namespace xmloff { namespace token {
         TOKEN( "!empty",                          XML_NOEMPTY ),
         TOKEN( "nohref",                          XML_NOHREF ),
         TOKEN( "!match",                          XML_NOMATCH ),
+        TOKEN( "non-whitespace-character-count",  XML_NON_WHITESPACE_CHARACTER_COUNT ),
         TOKEN( "none",                            XML_NONE ),
-        TOKEN( "notprsubset",                     XML_NOPRTSUBSET ),
         TOKEN( "normal",                          XML_NORMAL ),
         TOKEN( "normals-direction",               XML_NORMALS_DIRECTION ),
         TOKEN( "normals-kind",                    XML_NORMALS_KIND ),
@@ -1328,6 +1328,7 @@ namespace xmloff { namespace token {
         TOKEN( "note",                            XML_NOTE ),
         TOKEN( "notes",                           XML_NOTES ),
         TOKEN( "notin",                           XML_NOTIN ),
+        TOKEN( "notprsubset",                     XML_NOTPRSUBSET ),
         TOKEN( "notsubset",                       XML_NOTSUBSET ),
         TOKEN( "null-date",                       XML_NULL_DATE ),
         TOKEN( "null-year",                       XML_NULL_YEAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 921ff2b63b5a..024877e8cf45 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1235,8 +1235,8 @@ no-wrap
 NOEMPTY_DUMMY
 nohref
 NOMATCH_DUMMY
+non-whitespace-character-count
 none
-notprsubset
 normal
 normals-direction
 normals-kind
@@ -1246,6 +1246,7 @@ notation
 note
 notes
 notin
+notprsubset
 notsubset
 null-date
 null-year