summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-02-14 17:14:37 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-04 17:37:45 +0100
commitf1fea45fb225c79d2f5f6b25729825f9b7c5bd91 (patch)
tree664fdaaa49c8bb14d490551b314fdac1c83ebe67 /xmloff
parent29c4e4915bd659688af036f4a301f43175ed07eb (diff)
support new attribute also in 3.6, fdo#60760
Change-Id: I8beab492a3b9b42b323d7d6d9cebfbda1eae0ce1 Reviewed-on: https://gerrit.libreoffice.org/2159 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/xmloff/xmltoken.hxx1
-rw-r--r--xmloff/source/core/xmltoken.cxx1
2 files changed, 2 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 16fe5e86744a..dca9fcf5c103 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -850,6 +850,7 @@ namespace xmloff { namespace token {
XML_FOREIGN_OBJECT,
XML_FORMAT_CHANGE,
XML_FORMAT_SOURCE,
+ XML_FORMATTING_ENTRY,
XML_FORMS,
XML_FORMULA,
XML_FORMULA_HIDDEN,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a1147aa8a462..b21d7fada206 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -854,6 +854,7 @@ namespace xmloff { namespace token {
TOKEN( "foreign-object", XML_FOREIGN_OBJECT ),
TOKEN( "format-change", XML_FORMAT_CHANGE ),
TOKEN( "format-source", XML_FORMAT_SOURCE ),
+ TOKEN( "formatting-entry", XML_FORMATTING_ENTRY ),
TOKEN( "forms", XML_FORMS ),
TOKEN( "formula", XML_FORMULA ),
TOKEN( "formula-hidden", XML_FORMULA_HIDDEN ),