summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>2021-04-28 16:25:42 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2021-06-28 09:51:30 +0200
commit1f201fd6ae64c97102a60dfdecda25e1dd32d49a (patch)
treeb81c00288a9f568cc95cf9336d5b288233df2359 /xmloff
parent8b5fe4be2a5293af34c27fe21c68be198a82b154 (diff)
tdf#76258 Add ODF import/export
XML looks like: <table:filter-condition table:field-number="0" loext:data-type="background-color" table:value="#ffd7d7" table:operator="="/> <table:filter-condition table:field-number="1" loext:data-type="text-color" table:value="#3465a4" table:operator="="/> Change-Id: Idcddf0ce436da69567e5a7e9dfd7d796dc872586 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114812 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit e2bdd31c0231444f1ba1463bffb5656c230c3073) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115898 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmltoken.cxx1
-rw-r--r--xmloff/source/token/tokens.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 13f1415b8cc4..8c2276ab1251 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1891,6 +1891,7 @@ namespace xmloff { namespace token {
TOKEN( "text-background-color", XML_TEXT_BACKGROUND_COLOR ),
TOKEN( "text-blinking", XML_TEXT_BLINKING ),
TOKEN( "text-box", XML_TEXT_BOX ),
+ TOKEN( "text-color", XML_TEXT_COLOR ),
TOKEN( "text-combine", XML_TEXT_COMBINE ),
TOKEN( "text-combine-end-char", XML_TEXT_COMBINE_END_CHAR ),
TOKEN( "text-combine-start-char", XML_TEXT_COMBINE_START_CHAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index b2b95e956bd1..d2dd36122280 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1806,6 +1806,7 @@ text-autospace
text-background-color
text-blinking
text-box
+text-color
text-combine
text-combine-end-char
text-combine-start-char