summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-12-09 21:04:03 +0100
committerAndras Timar <andras.timar@collabora.com>2014-01-03 09:39:24 +0100
commit15a7b0d6a1d51b6eda51e549e6f1e9fdd4da3871 (patch)
treefc636aa3fb7c4bf45cc148b3ba3d92766a80ece1 /include
parentd77506f5b4d80b328d0869cd92eb6c54a98d5755 (diff)
resolved fdo#72537 write <loext:fill-character>
... instead of <number:fill-character> but read both. (cherry picked from commit 9f87de91cee05656808a98ab1bd65ad9509ef7df) Also needed for this is: xmloff: add a generic LibreOffice ODF extension namespace XML_NAMESPACE_LO_EXT can be used for elements and attributes that are not yet specified by OpenDocument. (Change-Id: Id29392533d46f6592d964ce79c05ffefa4d69ebc) Reviewed-on: https://gerrit.libreoffice.org/5419 Tested-by: Thorsten Behrens <tbehrens@suse.com> Reviewed-by: Thorsten Behrens <tbehrens@suse.com> (cherry picked from commit de9b067bd13ec6632b49c9683255bd3a1d7ae13e) Change-Id: Ia620fad575782f6174a9ee5fbbd8b396b21948e3 Reviewed-on: https://gerrit.libreoffice.org/7013 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/xmloff/xmlnmspe.hxx3
-rw-r--r--include/xmloff/xmltoken.hxx3
2 files changed, 5 insertions, 1 deletions
diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index b1646c307b63..e1b3fdb95f42 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -82,8 +82,9 @@ XML_NAMESPACE_EXT( TABLE, 38U )
XML_NAMESPACE_EXT( CHART, 39U )
XML_NAMESPACE_EXT( DRAW, 40U )
XML_NAMESPACE_EXT( CALC, 41U )
+XML_NAMESPACE_EXT( LO, 42U )
-#define _XML_OLD_NAMESPACE_BASE 42U
+#define _XML_OLD_NAMESPACE_BASE 43U
// namespaces used in the technical preview (SO 5.2)
XML_OLD_NAMESPACE( FO, 0U )
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index a40da2c19b5c..2e4962f038df 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -152,6 +152,9 @@ namespace xmloff { namespace token {
// calc extensions
XML_NP_CALC_EXT,
XML_N_CALC_EXT,
+ // generic LO extensions
+ XML_NP_LO_EXT,
+ XML_N_LO_EXT,
// units
XML_UNIT_MM,