include/xmloff/fastparser.hxx                       |   44 
 include/xmloff/prstylei.hxx                         |    4 
 include/xmloff/xmlictxt.hxx                         |    7 
 include/xmloff/xmlmultiimagehelper.hxx              |    2 
 include/xmloff/xmlnmspe.hxx                         |   10 
 include/xmloff/xmltoken.hxx                         |    2 
 sc/source/filter/xml/xmlcvali.cxx                   |    4 
 starmath/source/mathmlimport.cxx                    |    3 
 sw/source/filter/xml/swxml.cxx                      |   19 
 sw/source/filter/xml/xmlfmt.cxx                     |    6 
 sw/source/filter/xml/xmlitemi.cxx                   |    4 
 sw/source/filter/xml/xmltbli.cxx                    |   36 
 sw/source/filter/xml/xmltbli.hxx                    |    2 
 sw/source/uibase/config/StoredChapterNumbering.cxx  |    2 
 xmloff/Library_xo.mk                                |    1 
 xmloff/source/core/fastparser.cxx                   |   96 
 xmloff/source/core/xmlictxt.cxx                     |   26 
 xmloff/source/core/xmlimp.cxx                       |   66 
 xmloff/source/core/xmlmultiimagehelper.cxx          |   18 
 xmloff/source/core/xmltkmap.cxx                     |    2 
 xmloff/source/core/xmltoken.cxx                     | 6227 ++++++++++----------
 xmloff/source/draw/XMLShapePropertySetContext.cxx   |    8 
 xmloff/source/draw/sdxmlimp.cxx                     |    4 
 xmloff/source/draw/shapeimport.cxx                  |    8 
 xmloff/source/draw/ximp3dscene.cxx                  |    4 
 xmloff/source/draw/ximpshap.cxx                     |   28 
 xmloff/source/draw/ximpstyl.cxx                     |   18 
 xmloff/source/forms/elementimport.hxx               |    2 
 xmloff/source/forms/layerimport.cxx                 |    6 
 xmloff/source/forms/propertyimport.hxx              |    2 
 xmloff/source/style/GradientStyle.cxx               |    8 
 xmloff/source/style/HatchStyle.cxx                  |    4 
 xmloff/source/style/TransGradientStyle.cxx          |    8 
 xmloff/source/style/XMLFontStylesContext_impl.hxx   |    2 
 xmloff/source/style/prstylei.cxx                    |   14 
 xmloff/source/style/xmlnumi.cxx                     |    6 
 xmloff/source/style/xmlstyle.cxx                    |    8 
 xmloff/source/style/xmltabi.cxx                     |    4 
 xmloff/source/table/XMLTableImport.cxx              |    2 
 xmloff/source/text/XMLIndexTOCContext.cxx           |   16 
 xmloff/source/text/XMLTextColumnsContext.cxx        |   12 
 xmloff/source/text/XMLTextFrameContext.cxx          |   42 
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx |   12 
 xmloff/source/text/XMLTextListBlockContext.cxx      |   12 
 xmloff/source/text/XMLTextMasterPageContext.cxx     |    8 
 xmloff/source/text/XMLTextShapeStyleContext.cxx     |    4 
 xmloff/source/text/txtfldi.cxx                      |    4 
 xmloff/source/text/txtimp.cxx                       |   32 
 xmloff/source/text/txtlists.cxx                     |   10 
 xmloff/source/text/txtparaimphint.hxx               |   12 
 xmloff/source/text/txtstyli.cxx                     |    6 
 xmloff/source/token/tokens.txt                      |    3 
 52 files changed, 3536 insertions(+), 3354 deletions(-)

New commits:
commit 4d7c78d2d5011d208c2622f1b88246d7e400f5a8
Author: Daniel Sikeler <d.sikele...@gmail.com>
Date:   Fri Mar 13 08:12:30 2015 +0100

    parse odf-files with fastparser in writer
    
    Change-Id: I996bab279c4626cb803ec8f12deb6d99edd4d1f8

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 3b3559c..80a1ec4 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -62,8 +62,7 @@
 #include <swmodule.hxx>
 #include <SwXMLSectionList.hxx>
 #include <statstr.hrc>
-#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/fasttokenhandler.hxx>
+#include <xmloff/fastparser.hxx>
 
 #include <SwStyleNameMapper.hxx>
 #include <poolfmt.hxx>
@@ -150,12 +149,9 @@ sal_Int32 ReadThroughComponent(
     aParserInput.sSystemId = rName;
     aParserInput.aInputStream = xInputStream;
 
-    // get parser
-    uno::Reference< xml::sax::XParser > xParser = 
xml::sax::Parser::create(rxContext);
-    SAL_INFO( "sw.filter", "parser created" );
     // get filter
     const OUString aFilterName(OUString::createFromAscii(pFilterName));
-    uno::Reference< xml::sax::XDocumentHandler > xFilter(
+    uno::Reference< xml::sax::XFastDocumentHandler > xFilter(
         
rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(aFilterName,
 rFilterArguments, rxContext),
         UNO_QUERY);
     SAL_WARN_IF(!xFilter.is(), "sw", "Can't instantiate filter component: " << 
aFilterName);
@@ -163,7 +159,8 @@ sal_Int32 ReadThroughComponent(
         return ERR_SWG_READ_ERROR;
     SAL_INFO( "sw.filter", "" << pFilterName << " created" );
     // connect parser and filter
-    xParser->setDocumentHandler( xFilter );
+    xmloff::core::FastParser* xParser = new xmloff::core::FastParser( 
rxContext, xFilter );
+    SAL_INFO( "sw.filter", "parser created" );
 
     // connect model and filter
     uno::Reference < XImporter > xImporter( xFilter, UNO_QUERY );
@@ -1010,15 +1007,9 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium,
 
             // get filter
             uno::Reference< xml::sax::XFastDocumentHandler > xFilter = new 
SwXMLSectionList( xContext, rStrings );
-            uno::Reference< xml::sax::XFastTokenHandler > xTokenHandler = new 
xmloff::token::FastTokenHandler();
 
             // connect parser and filter
-            uno::Reference< xml::sax::XFastParser > xParser = 
xml::sax::FastParser::create(xContext);
-            xParser->setFastDocumentHandler( xFilter );
-            xParser->setTokenHandler( xTokenHandler );
-
-            xParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:office:1.0", FastToken::NAMESPACE | 
XML_NAMESPACE_OFFICE );
-            xParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:text:1.0", FastToken::NAMESPACE | 
XML_NAMESPACE_TEXT );
+            xmloff::core::FastParser* xParser = new xmloff::core::FastParser( 
xContext, xFilter );
 
             // parse
             xParser->parseStream( aParserInput );
commit 1d76b623ad5597963bee0a7a9664d02409f666fb
Author: Daniel Sikeler <d.sikele...@gmail.com>
Date:   Fri Mar 13 07:57:32 2015 +0100

    a fastparser, which automatically registers ...
    
    all odf-namespaces and the tokenhandler
    
    Change-Id: I4036e427f5931a2c597f5d373e9040d7beaf95a7

diff --git a/include/xmloff/fastparser.hxx b/include/xmloff/fastparser.hxx
new file mode 100644
index 0000000..c979e8c
--- /dev/null
+++ b/include/xmloff/fastparser.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_XMLOFF_FASTPARSER_HXX
+#define INCLUDED_XMLOFF_FASTPARSER_HXX
+
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <xmloff/dllapi.h>
+
+namespace xmloff {
+namespace core {
+
+class XMLOFF_DLLPUBLIC FastParser
+{
+private:
+    css::uno::Reference< css::xml::sax::XFastParser > mxParser;
+
+public:
+    FastParser(
+        const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+        const css::uno::Reference< css::xml::sax::XFastDocumentHandler >& 
rxDocHandler )
+        throw( css::lang::IllegalArgumentException, css::uno::RuntimeException 
);
+
+    void parseStream( const css::xml::sax::InputSource& rInputSoure )
+        throw( css::xml::sax::SAXException, css::io::IOException, 
css::uno::RuntimeException );
+
+    void parseStream( const css::uno::Reference< css::io::XInputStream >& 
rxInStream,
+            const OUString& rStreamName )
+        throw( css::xml::sax::SAXException, css::io::IOException, 
css::uno::RuntimeException );
+};
+
+} // namespace core
+} // namespace xmloff
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 3546b7b..96c2710 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -91,6 +91,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
     xmloff/source/core/DocumentSettingsContext \
     xmloff/source/core/DomBuilderContext \
     xmloff/source/core/DomExport \
+       xmloff/source/core/fastparser \
        xmloff/source/core/fasttokenhandler \
     xmloff/source/core/ProgressBarHelper \
     xmloff/source/core/PropertySetMerger \
diff --git a/xmloff/source/core/fastparser.cxx 
b/xmloff/source/core/fastparser.cxx
new file mode 100644
index 0000000..7a49260
--- /dev/null
+++ b/xmloff/source/core/fastparser.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <xmloff/fastparser.hxx>
+#include <xmloff/fasttokenhandler.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <com/sun/star/xml/sax/FastParser.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
+
+using namespace css;
+using namespace css::uno;
+using css::xml::sax::FastToken::NAMESPACE;
+
+namespace xmloff {
+namespace core {
+
+FastParser::FastParser(
+    const Reference< XComponentContext >& rxContext,
+    const Reference< xml::sax::XFastDocumentHandler >& rxDocHandler )
+    throw( lang::IllegalArgumentException, RuntimeException )
+{
+    mxParser = xml::sax::FastParser::create(rxContext);
+    mxParser->setTokenHandler( new xmloff::token::FastTokenHandler() );
+    mxParser->setFastDocumentHandler( rxDocHandler );
+    // register namespaces
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:office:1.0", NAMESPACE | 
XML_NAMESPACE_OFFICE );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:style:1.0", NAMESPACE | 
XML_NAMESPACE_STYLE );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:text:1.0", NAMESPACE | 
XML_NAMESPACE_TEXT );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:table:1.0", NAMESPACE | 
XML_NAMESPACE_TABLE );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", NAMESPACE | 
XML_NAMESPACE_DRAW );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", NAMESPACE | 
XML_NAMESPACE_FO );
+    mxParser->registerNamespace( "http://www.w3.org/1999/xlink";, NAMESPACE | 
XML_NAMESPACE_XLINK );
+    mxParser->registerNamespace( "http://purl.org/dc/elements/1.1/";, NAMESPACE 
| XML_NAMESPACE_DC );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:meta:1.0", NAMESPACE | 
XML_NAMESPACE_META );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0", NAMESPACE | 
XML_NAMESPACE_NUMBER );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", NAMESPACE | 
XML_NAMESPACE_PRESENTATION );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", NAMESPACE | 
XML_NAMESPACE_SVG );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:chart:1.0", NAMESPACE | 
XML_NAMESPACE_CHART );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0", NAMESPACE | 
XML_NAMESPACE_DR3D );
+    mxParser->registerNamespace( "http://www.w3.org/1998/Math/MathML";, 
NAMESPACE | XML_NAMESPACE_MATH );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:form:1.0", NAMESPACE | 
XML_NAMESPACE_FORM );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:script:1.0", NAMESPACE | 
XML_NAMESPACE_SCRIPT );
+    mxParser->registerNamespace( "http://openoffice.org/2001/block-list";, 
NAMESPACE | XML_NAMESPACE_BLOCKLIST );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:config:1.0", NAMESPACE | 
XML_NAMESPACE_CONFIG );
+    mxParser->registerNamespace( "http://openoffice.org/2004/office";, 
NAMESPACE | XML_NAMESPACE_OOO );
+    mxParser->registerNamespace( "http://openoffice.org/2004/writer";, 
NAMESPACE | XML_NAMESPACE_OOOW );
+    mxParser->registerNamespace( "http://openoffice.org/2004/calc";, NAMESPACE 
| XML_NAMESPACE_OOOC );
+    mxParser->registerNamespace( "http://www.w3.org/2001/xml-events";, 
NAMESPACE | XML_NAMESPACE_DOM );
+    mxParser->registerNamespace( "http://openoffice.org/2004/database";, 
NAMESPACE | XML_NAMESPACE_DB );
+    mxParser->registerNamespace( "http://openoffice.org/2000/dialog";, 
NAMESPACE | XML_NAMESPACE_DLG );
+    mxParser->registerNamespace( "http://www.w3.org/2002/xforms";, NAMESPACE | 
XML_NAMESPACE_XFORMS );
+    mxParser->registerNamespace( "http://www.w3.org/2001/XMLSchema";, NAMESPACE 
| XML_NAMESPACE_XSD );
+    mxParser->registerNamespace( "http://www.w3.org/2001/XMLSchema-instance";, 
NAMESPACE | XML_NAMESPACE_XSI );
+    mxParser->registerNamespace( "http://www.w3.org/2001/SMIL20/";, NAMESPACE | 
XML_NAMESPACE_SMIL );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:animation:1.0", NAMESPACE | 
XML_NAMESPACE_ANIMATION );
+    mxParser->registerNamespace( "http://www.w3.org/XML/1998/namespace";, 
NAMESPACE | XML_NAMESPACE_XML );
+    mxParser->registerNamespace( "http://openoffice.org/2005/report";, 
NAMESPACE | XML_NAMESPACE_REPORT );
+    mxParser->registerNamespace( 
"urn:oasis:names:tc:opendocument:xmlns:of:1.2", NAMESPACE | XML_NAMESPACE_OF );
+    mxParser->registerNamespace( "http://www.w3.org/1999/xhtml";, NAMESPACE | 
XML_NAMESPACE_XHTML );
+    mxParser->registerNamespace( "http://www.w3.org/2003/g/data-view#";, 
NAMESPACE | XML_NAMESPACE_GRDDL );
+    mxParser->registerNamespace( "http://openoffice.org/2009/office";, 
NAMESPACE | XML_NAMESPACE_OFFICE_EXT );
+    mxParser->registerNamespace( "http://openoffice.org/2009/table";, NAMESPACE 
| XML_NAMESPACE_TABLE_EXT );
+    mxParser->registerNamespace( "http://openoffice.org/2009/draw";, NAMESPACE 
| XML_NAMESPACE_DRAW_EXT );
+    mxParser->registerNamespace( 
"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0", 
NAMESPACE | XML_NAMESPACE_CALC_EXT );
+    mxParser->registerNamespace( 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0", 
NAMESPACE | XML_NAMESPACE_LO_EXT );
+    mxParser->registerNamespace( 
"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0", NAMESPACE | 
XML_NAMESPACE_FIELD );
+    mxParser->registerNamespace( "http://www.w3.org/TR/css3-text/";, NAMESPACE 
| XML_NAMESPACE_CSS3TEXT );
+    mxParser->registerNamespace( 
"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", NAMESPACE 
| XML_NAMESPACE_FORMX );
+}
+
+void FastParser::parseStream( const xml::sax::InputSource& rInputSource )
+    throw( xml::sax::SAXException, io::IOException, RuntimeException )
+{
+    mxParser->parseStream( rInputSource );
+}
+
+void FastParser::parseStream( const Reference< io::XInputStream >& rxInStream,
+    const OUString& rStreamName )
+    throw( xml::sax::SAXException, io::IOException, RuntimeException )
+{
+    xml::sax::InputSource aInputSource;
+    aInputSource.sSystemId = rStreamName;
+    aInputSource.aInputStream = rxInStream;
+    parseStream( aInputSource );
+}
+
+} // namespace core
+} // namespace xmloff
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 878a916e18b66835aa79cef550141c31105ffd11
Author: Daniel Sikeler <d.sikele...@gmail.com>
Date:   Fri Mar 13 08:21:03 2015 +0100

    workaround for fastparser
    
    fastmethods are calling the old ones.
    
    Change-Id: Ic2795a1b9278f960b3741b87b0f4844f9965ffcd

diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index ca897d0..1fd41ee 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -26,8 +26,11 @@
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlictxt.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <comphelper/attributelist.hxx>
 
 using namespace ::com::sun::star;
+using namespace comphelper;
 
 TYPEINIT0( SvXMLImportContext );
 SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
@@ -70,9 +73,16 @@ void SvXMLImportContext::Characters( const OUString& )
 }
 
 // ::com::sun::star::xml::sax::XFastContextHandler:
-void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32, const 
uno::Reference< xml::sax::XFastAttributeList > &)
+void SAL_CALL SvXMLImportContext::startFastElement(sal_Int32, const 
uno::Reference< xml::sax::XFastAttributeList > &xAttrList)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
+    AttributeList* pAttrList = new AttributeList();
+    uno::Sequence< xml::FastAttribute > attributes = 
xAttrList->getFastAttributes();
+    for( xml::FastAttribute attribute : attributes )
+    {
+        pAttrList->AddAttribute( xmloff::token::GetXMLToken( attribute.Token 
), "", attribute.Value );
+    }
+    StartElement( pAttrList );
 }
 
 void SAL_CALL SvXMLImportContext::startUnknownElement(const OUString &, const 
OUString &,
@@ -84,6 +94,7 @@ void SAL_CALL SvXMLImportContext::startUnknownElement(const 
OUString &, const OU
 void SAL_CALL SvXMLImportContext::endFastElement(sal_Int32)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
+    EndElement();
 }
 
 void SAL_CALL SvXMLImportContext::endUnknownElement (const OUString & , const 
OUString & )
@@ -92,10 +103,16 @@ void SAL_CALL SvXMLImportContext::endUnknownElement (const 
OUString & , const OU
 }
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
SvXMLImportContext::createFastChildContext
-    (sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & 
Attribs)
+    (sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & 
xAttrList)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
-    return mrImport.CreateFastContext( Element, Attribs );
+    AttributeList* pAttrList = new AttributeList();
+    uno::Sequence< xml::FastAttribute > attributes = 
xAttrList->getFastAttributes();
+    for( xml::FastAttribute attribute : attributes )
+    {
+        pAttrList->AddAttribute( xmloff::token::GetXMLToken( attribute.Token 
), "", attribute.Value );
+    }
+    return CreateChildContext( Element & 0x7F000, xmloff::token::GetXMLToken( 
Element ), pAttrList );
 }
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
SvXMLImportContext::createUnknownChildContext
@@ -105,9 +122,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
SvXMLImportContext::cre
     return 0;
 }
 
-void SAL_CALL SvXMLImportContext::characters(const OUString &)
+void SAL_CALL SvXMLImportContext::characters(const OUString & rChars)
     throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
+    Characters( rChars );
 }
 
 void SvXMLImportContext::onDemandRescueUsefulDataFromTemporary( const 
SvXMLImportContext& )
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index fe9d9fa..a287396 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -54,6 +54,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
+#include <comphelper/attributelist.hxx>
 #include <unotools/fontcvt.hxx>
 
 #include <com/sun/star/rdf/XMetadatable.hpp>
@@ -346,10 +347,16 @@ SvXMLImportContext *SvXMLImport::CreateContext( 
sal_uInt16 nPrefix,
     return new SvXMLImportContext( *this, nPrefix, rLocalName );
 }
 
-SvXMLImportContext *SvXMLImport::CreateFastContext( sal_Int32 /*Element*/,
-        const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/ )
+SvXMLImportContext *SvXMLImport::CreateFastContext( sal_Int32 Element,
+        const uno::Reference< xml::sax::XFastAttributeList >& xAttrList )
 {
-    return new SvXMLImportContext( *this );
+    comphelper::AttributeList *pAttrList = new comphelper::AttributeList();
+    uno::Sequence< xml::FastAttribute > attributes = 
xAttrList->getFastAttributes();
+    for( xml::FastAttribute attribute : attributes )
+    {
+        pAttrList->AddAttribute( GetXMLToken( attribute.Token ), "", 
attribute.Value );
+    }
+    return CreateContext( 0x7F000 & Element, GetXMLToken( Element ), pAttrList 
);
 }
 
 void SvXMLImport::_InitCtor()
commit d9c6f5bb17cb6413086b29a6f33db23e21c42513
Author: Daniel Sikeler <d.sikele...@gmail.com>
Date:   Thu Mar 12 15:29:54 2015 +0100

    workaround for fastparser
    
    the fasttokens can now be mapped to the slow-tokens (prefix and string)
    
    Change-Id: I15ca41d3cbbc012b55acbdef96c4b85782a1337d

diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index 890141d..1b58a3b 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -23,12 +23,12 @@
 #include <sal/types.h>
 
 #define XML_NAMESPACE( prefix, key ) \
-const sal_uInt16 XML_NAMESPACE_##prefix         = key; \
-const sal_uInt16 XML_NAMESPACE_##prefix##_IDX   = key;
+const sal_uInt16 XML_NAMESPACE_##prefix         = static_cast<sal_uInt16>(key 
<< 12); \
+const sal_uInt16 XML_NAMESPACE_##prefix##_IDX   = static_cast<sal_uInt16>(key 
<< 12);
 
 #define XML_OLD_NAMESPACE( prefix, index ) \
 const sal_uInt16 XML_OLD_NAMESPACE_##prefix##_IDX = \
-    (_XML_OLD_NAMESPACE_BASE+index);
+    static_cast<sal_uInt16>((_XML_OLD_NAMESPACE_BASE+index) << 12);
 
 // current namespaces
 // These namespaces have the same index in the namespace table as prefix used.
@@ -74,8 +74,8 @@ XML_NAMESPACE( GRDDL,           36U )
 // namespaces for odf extended formats
 
 #define XML_NAMESPACE_EXT( prefix, key ) \
-const sal_uInt16 XML_NAMESPACE_##prefix##_EXT       = key; \
-const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX   = key;
+const sal_uInt16 XML_NAMESPACE_##prefix##_EXT       = 
static_cast<sal_uInt16>(key << 12); \
+const sal_uInt16 XML_NAMESPACE_##prefix##_EXT_IDX   = 
static_cast<sal_uInt16>(key << 12);
 
 XML_NAMESPACE_EXT( OFFICE,      37U )
 XML_NAMESPACE_EXT( TABLE,       38U )
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 1fb984f..f4b4d28 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3251,6 +3251,8 @@ namespace xmloff { namespace token {
     XMLOFF_DLLPUBLIC const OUString& GetXMLToken(
         enum XMLTokenEnum eToken );
 
+    XMLOFF_DLLPUBLIC const OUString& GetXMLToken( sal_Int32 Element );
+
     /// compare eToken to the string
     XMLOFF_DLLPUBLIC bool IsXMLToken(
         const OUString& rString,
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index 28112e5..d499b5d 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -78,7 +78,7 @@ SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_uInt16 
nKeyPrefix,
 SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_Int32 nTok ) const
 {
     SvXMLTokenMapEntry_Impl *pRet = 0;
-    SvXMLTokenMapEntry_Impl aTst( 0, "", nTok );
+    SvXMLTokenMapEntry_Impl aTst( nTok & 0x7F000, GetXMLToken(nTok), nTok );
 
     SvXMLTokenMap_Impl::iterator it = pImpl->find( aTst );
     if( it != pImpl->end() )
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 91d20c5..a7ce0c0 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -21,6 +21,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustring.hxx>
+#include <xmloff/token/tokens.hxx>
 
 
 namespace xmloff { namespace token {
@@ -36,6 +37,7 @@ namespace xmloff { namespace token {
 #if OSL_DEBUG_LEVEL > 0
             XMLTokenEnum eToken;
 #endif
+            sal_Int32 fastToken;
         };
     }
 
@@ -43,3208 +45,3208 @@ namespace xmloff { namespace token {
 
 
 #if OSL_DEBUG_LEVEL > 0
-    #define TOKEN( s, e ) { sizeof(s)-1, s, NULL, e }
+    #define TOKEN( s, e, f ) { sizeof(s)-1, s, NULL, e, f }
 #else
-    #define TOKEN( s, e ) { sizeof(s)-1, s, NULL }
+    #define TOKEN( s, e, f ) { sizeof(s)-1, s, NULL, f }
 #endif
 
     struct XMLTokenEntry aTokenList[] =
     {
 #if OSL_DEBUG_LEVEL > 0
-        { 0, NULL, NULL, XML_TOKEN_START },
+        { 0, NULL, NULL, XML_TOKEN_START, xmloff::XML_TOKEN_INVALID },
 #else
-        { 0, NULL, NULL },                            // XML_TOKEN_START
+        { 0, NULL, NULL, xmloff::XML_TOKEN_INVALID },                          
  // XML_TOKEN_START
 #endif
 
         // common XML
-        TOKEN( "CDATA",                 XML_CDATA ),
-        TOKEN( " ",                     XML_WS ),
-        TOKEN( "xml",                   XML_XML ),
-        TOKEN( "xmlns",                 XML_XMLNS ),
-        TOKEN( "version=\"1.0\" encoding=\"UTF-8\"",      XML_XML_PI ),
-        TOKEN( "<!DOCTYPE ",            XML_XML_DOCTYPE_PREFIX ),
-        TOKEN( " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" 
\"office.dtd\">",      XML_XML_DOCTYPE_SUFFIX ),
+        TOKEN( "CDATA",                 XML_CDATA, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( " ",                     XML_WS, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xml",                   XML_XML, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xmlns",                 XML_XMLNS, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "version=\"1.0\" encoding=\"UTF-8\"",      XML_XML_PI, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "<!DOCTYPE ",            XML_XML_DOCTYPE_PREFIX, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" 
\"office.dtd\">",      XML_XML_DOCTYPE_SUFFIX, xmloff::XML_TOKEN_INVALID ),
 
         // namespace prefixes and names
-        TOKEN( "http://www.w3.org/XML/1998/namespace";,      XML_N_XML ),
-        TOKEN( "office",                XML_NP_OFFICE ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:office:1.0",      
XML_N_OFFICE ),
-        TOKEN( "http://sun.com/xmlns/staroffice/office";,      XML_N_OFFICE_OLD 
),
-        TOKEN( "meta",                  XML_NP_META ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",      
XML_N_META ),
-        TOKEN( "http://sun.com/xmlns/staroffice/meta";,      XML_N_META_OLD ),
-        TOKEN( "style",                 XML_NP_STYLE ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:style:1.0",      
XML_N_STYLE ),
-        TOKEN( "http://sun.com/xmlns/staroffice/style";,      XML_N_STYLE_OLD ),
-        TOKEN( "number",                XML_NP_NUMBER ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",      
XML_N_NUMBER ),
-        TOKEN( "http://sun.com/xmlns/staroffice/number";,      XML_N_NUMBER_OLD 
),
-        TOKEN( "text",                  XML_NP_TEXT ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:text:1.0",      
XML_N_TEXT ),
-        TOKEN( "http://sun.com/xmlns/staroffice/text";,      XML_N_TEXT_OLD ),
-        TOKEN( "table",                 XML_NP_TABLE ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:table:1.0",      
XML_N_TABLE ),
-        TOKEN( "http://sun.com/xmlns/staroffice/table";,      XML_N_TABLE_OLD ),
-        TOKEN( "draw",                  XML_NP_DRAW ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",      
XML_N_DRAW ),
-        TOKEN( "dr3d",                  XML_NP_DR3D ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",      
XML_N_DR3D ),
-        TOKEN( "http://sun.com/xmlns/staroffice/draw";,      XML_N_DRAW_OLD ),
-        TOKEN( "presentation",             XML_NP_PRESENTATION ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",      
XML_N_PRESENTATION ),
-        TOKEN( "http://sun.com/xmlns/staroffice/presentation";,      
XML_N_PRESENTATION_OLD ),
-        TOKEN( "chart",                     XML_NP_CHART ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:chart:1.0",      
XML_N_CHART ),
-        TOKEN( "config",                    XML_NP_CONFIG ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:config:1.0",      
XML_N_CONFIG ),
-        TOKEN( "http://sun.com/xmlns/staroffice/chart";,      XML_N_CHART_OLD ),
-        TOKEN( "fo",                        XML_NP_FO ),
-        TOKEN( "http://www.w3.org/1999/XSL/Format/";,      XML_N_FO_OLD ),
-        TOKEN( "http://www.w3.org/1999/XSL/Format";,      XML_N_FO ),
-        TOKEN( "xlink",                     XML_NP_XLINK ),
-        TOKEN( "http://www.w3.org/1999/xlink";,      XML_N_XLINK ),
-        TOKEN( "http://www.w3.org/1999/xlink/namespace";,      XML_N_XLINK_OLD 
),
-        TOKEN( "dc",                        XML_NP_DC ),
-        TOKEN( "http://purl.org/dc/elements/1.1/";,      XML_N_DC ),
-        TOKEN( "svg",                       XML_NP_SVG ),
-        TOKEN( "http://www.w3.org/2000/svg";,      XML_N_SVG ),
-        TOKEN( "form",                      XML_NP_FORM ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:form:1.0",      
XML_N_FORM ),
-        TOKEN( "script",                    XML_NP_SCRIPT ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:script:1.0",      
XML_N_SCRIPT ),
-        TOKEN( "xforms",                                    XML_NP_XFORMS_1_0 
),
-        TOKEN( "http://www.w3.org/2002/xforms";,             XML_N_XFORMS_1_0 ),
-        TOKEN( "xsd",                                       XML_NP_XSD ),
-        TOKEN( "http://www.w3.org/2001/XMLSchema";,          XML_N_XSD ),
-        TOKEN( "xsi",                                       XML_NP_XSI ),
-        TOKEN( "http://www.w3.org/2001/XMLSchema-instance";, XML_N_XSI ),
-
-        TOKEN( "block-list",                XML_NP_BLOCK_LIST ),
-        TOKEN( "http://openoffice.org/2001/block-list";,      XML_N_BLOCK_LIST 
),
-
-        TOKEN( "math",                      XML_NP_MATH ),
-        TOKEN( "http://www.w3.org/1998/Math/MathML";,      XML_N_MATH ),
-
-        TOKEN( "VL",                        XML_NP_VERSIONS_LIST ),
-        TOKEN( "http://openoffice.org/2001/versions-list";,      
XML_N_VERSIONS_LIST ),
+        TOKEN( "http://www.w3.org/XML/1998/namespace";,      XML_N_XML, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "office",                XML_NP_OFFICE, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:office:1.0",      
XML_N_OFFICE, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/office";,      
XML_N_OFFICE_OLD, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "meta",                  XML_NP_META, xmloff::XML_TOKEN_INVALID 
),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",      
XML_N_META, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/meta";,      XML_N_META_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "style",                 XML_NP_STYLE, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:style:1.0",      
XML_N_STYLE, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/style";,      XML_N_STYLE_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "number",                XML_NP_NUMBER, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",      
XML_N_NUMBER, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/number";,      
XML_N_NUMBER_OLD, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "text",                  XML_NP_TEXT, xmloff::XML_TOKEN_INVALID 
),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:text:1.0",      
XML_N_TEXT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/text";,      XML_N_TEXT_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "table",                 XML_NP_TABLE, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:table:1.0",      
XML_N_TABLE, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/table";,      XML_N_TABLE_OLD , 
xmloff::XML_TOKEN_INVALID),
+        TOKEN( "draw",                  XML_NP_DRAW, xmloff::XML_TOKEN_INVALID 
),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",      
XML_N_DRAW, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "dr3d",                  XML_NP_DR3D, xmloff::XML_TOKEN_INVALID 
),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",      
XML_N_DR3D, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/draw";,      XML_N_DRAW_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "presentation",             XML_NP_PRESENTATION, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",      
XML_N_PRESENTATION, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/presentation";,      
XML_N_PRESENTATION_OLD, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "chart",                     XML_NP_CHART, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:chart:1.0",      
XML_N_CHART, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "config",                    XML_NP_CONFIG, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:config:1.0",      
XML_N_CONFIG, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://sun.com/xmlns/staroffice/chart";,      XML_N_CHART_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "fo",                        XML_NP_FO, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1999/XSL/Format/";,      XML_N_FO_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1999/XSL/Format";,      XML_N_FO, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xlink",                     XML_NP_XLINK, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1999/xlink";,      XML_N_XLINK, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1999/xlink/namespace";,      XML_N_XLINK_OLD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "dc",                        XML_NP_DC, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://purl.org/dc/elements/1.1/";,      XML_N_DC, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "svg",                       XML_NP_SVG, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/2000/svg";,      XML_N_SVG, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "form",                      XML_NP_FORM, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:form:1.0",      
XML_N_FORM, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "script",                    XML_NP_SCRIPT, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:script:1.0",      
XML_N_SCRIPT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xforms",                                    XML_NP_XFORMS_1_0, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/2002/xforms";,             XML_N_XFORMS_1_0, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xsd",                                       XML_NP_XSD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/2001/XMLSchema";,          XML_N_XSD, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "xsi",                                       XML_NP_XSI, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/2001/XMLSchema-instance";, XML_N_XSI, 
xmloff::XML_TOKEN_INVALID ),
+
+        TOKEN( "block-list",                XML_NP_BLOCK_LIST, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://openoffice.org/2001/block-list";,      XML_N_BLOCK_LIST, 
xmloff::XML_TOKEN_INVALID ),
+
+        TOKEN( "math",                      XML_NP_MATH, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1998/Math/MathML";,      XML_N_MATH, 
xmloff::XML_TOKEN_INVALID ),
+
+        TOKEN( "VL",                        XML_NP_VERSIONS_LIST, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://openoffice.org/2001/versions-list";,      
XML_N_VERSIONS_LIST, xmloff::XML_TOKEN_INVALID ),
 
         // erAck: 2008-04-09T20:12+0200  OpenFormula aka ODFF
-        TOKEN( "of",                    XML_NP_OF ),
-        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:of:1.2",  XML_N_OF ),
+        TOKEN( "of",                    XML_NP_OF, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "urn:oasis:names:tc:opendocument:xmlns:of:1.2",  XML_N_OF, 
xmloff::XML_TOKEN_INVALID ),
 
         // ODF 1.2 metadata: RDFa and GRDDL
-        TOKEN( "xhtml",                                 XML_NP_XHTML ),
-        TOKEN( "http://www.w3.org/1999/xhtml";,          XML_N_XHTML ),
-        TOKEN( "grddl",                                 XML_NP_GRDDL ),
-        TOKEN( "http://www.w3.org/2003/g/data-view#";,   XML_N_GRDDL ),
+        TOKEN( "xhtml",                                 XML_NP_XHTML, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/1999/xhtml";,          XML_N_XHTML, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "grddl",                                 XML_NP_GRDDL, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/2003/g/data-view#";,   XML_N_GRDDL, 
xmloff::XML_TOKEN_INVALID ),
 
         // ODF Enhanced namespaces
-        TOKEN( "officeooo", XML_NP_OFFICE_EXT ),
-        TOKEN( "http://openoffice.org/2009/office";, XML_N_OFFICE_EXT ),
+        TOKEN( "officeooo", XML_NP_OFFICE_EXT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://openoffice.org/2009/office";, XML_N_OFFICE_EXT, 
xmloff::XML_TOKEN_INVALID ),
 
         // jonp: 2008-09-24 Excel Interop
-        TOKEN( "formx",                           XML_NP_FORMX ),
-        TOKEN( 
"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", 
XML_N_FORMX ),
-        TOKEN( "tableooo", XML_NP_TABLE_EXT ),
-        TOKEN( "http://openoffice.org/2009/table";, XML_N_TABLE_EXT ),
+        TOKEN( "formx",                           XML_NP_FORMX, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( 
"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", 
XML_N_FORMX, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "tableooo", XML_NP_TABLE_EXT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://openoffice.org/2009/table";, XML_N_TABLE_EXT, 
xmloff::XML_TOKEN_INVALID ),
 
-        TOKEN( "drawooo", XML_NP_DRAW_EXT ),
-        TOKEN( "http://openoffice.org/2010/draw";, XML_N_DRAW_EXT ),
+        TOKEN( "drawooo", XML_NP_DRAW_EXT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://openoffice.org/2010/draw";, XML_N_DRAW_EXT, 
xmloff::XML_TOKEN_INVALID ),
 
-        TOKEN( "css3t",                        XML_NP_CSS3TEXT ),
-        TOKEN( "http://www.w3.org/TR/css3-text/";, XML_N_CSS3TEXT ),
+        TOKEN( "css3t",                        XML_NP_CSS3TEXT, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "http://www.w3.org/TR/css3-text/";, XML_N_CSS3TEXT, 
xmloff::XML_TOKEN_INVALID ),
 
         // extension namespace for calc extensions
-        TOKEN( "calcext",                         XML_NP_CALC_EXT ),
-        TOKEN( 
"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0", 
XML_N_CALC_EXT ),
-        TOKEN( "loext",                           XML_NP_LO_EXT ),
-        TOKEN( 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0", 
XML_N_LO_EXT ),
+        TOKEN( "calcext",                         XML_NP_CALC_EXT, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( 
"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0", 
XML_N_CALC_EXT, xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "loext",                           XML_NP_LO_EXT, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0", 
XML_N_LO_EXT, xmloff::XML_TOKEN_INVALID ),
 
         // units
-        TOKEN( "mm",                              XML_UNIT_MM ),
-        TOKEN( "m",                               XML_UNIT_M ),
-        TOKEN( "km",                              XML_UNIT_KM ),
-        TOKEN( "cm",                              XML_UNIT_CM ),
-        TOKEN( "pt",                              XML_UNIT_PT ),
-        TOKEN( "pc",                              XML_UNIT_PC ),
-        TOKEN( "ft",                              XML_UNIT_FOOT ),
-        TOKEN( "mi",                              XML_UNIT_MILES ),
-        TOKEN( "in",                              XML_UNIT_INCH ),
+        TOKEN( "mm",                              XML_UNIT_MM, xmloff::XML_mm 
),
+        TOKEN( "m",                               XML_UNIT_M, xmloff::XML_m ),
+        TOKEN( "km",                              XML_UNIT_KM, xmloff::XML_km 
),
+        TOKEN( "cm",                              XML_UNIT_CM, xmloff::XML_cm 
),
+        TOKEN( "pt",                              XML_UNIT_PT, xmloff::XML_pt 
),
+        TOKEN( "pc",                              XML_UNIT_PC, xmloff::XML_pc 
),
+        TOKEN( "ft",                              XML_UNIT_FOOT, 
xmloff::XML_ft ),
+        TOKEN( "mi",                              XML_UNIT_MILES, 
xmloff::XML_mi ),
+        TOKEN( "in",                              XML_UNIT_INCH, 
xmloff::XML_in ),
 
         // any other
-        TOKEN( "1",                               XML_1 ),
-        TOKEN( "10",                              XML_10 ),
-        TOKEN( "2",                               XML_2 ),
-        TOKEN( "3",                               XML_3 ),
-        TOKEN( "4",                               XML_4 ),
-        TOKEN( "5",                               XML_5 ),
-        TOKEN( "6",                               XML_6 ),
-        TOKEN( "7",                               XML_7 ),
-        TOKEN( "8",                               XML_8 ),
-        TOKEN( "9",                               XML_9 ),
-        TOKEN( "A",                               XML_A_UPCASE ),
-        TOKEN( "I",                               XML_I_UPCASE ),
-        TOKEN( "IBM437",                          XML_IBM437 ),
-        TOKEN( "IBM850",                          XML_IBM850 ),
-        TOKEN( "IBM860",                          XML_IBM860 ),
-        TOKEN( "IBM861",                          XML_IBM861 ),
-        TOKEN( "IBM863",                          XML_IBM863 ),
-        TOKEN( "IBM865",                          XML_IBM865 ),
-        TOKEN( "ISO-8859-1",                      XML_ISO_8859_1 ),
-        TOKEN( "ole2",                            XML_OLE2 ),
-        TOKEN( ":",                               XML__COLON ),
-        TOKEN( "",                                XML__EMPTY ),
-        TOKEN( "_unknown_",                       XML__UNKNOWN_ ),
-
-        TOKEN( "a",                               XML_A ),
-        TOKEN( "abbreviated-name",                XML_ABBREVIATED_NAME ),
-        TOKEN( "above",                           XML_ABOVE ),
-        TOKEN( "abs",                             XML_ABS ),
-        TOKEN( "accent",                          XML_ACCENT ),
-        TOKEN( "accentunder",                     XML_ACCENTUNDER ),
-        TOKEN( "acceptance-state",                XML_ACCEPTANCE_STATE ),
-        TOKEN( "accepted",                        XML_ACCEPTED ),
-        TOKEN( "action",                          XML_ACTION ),
-        TOKEN( "active",                          XML_ACTIVE ),
-        TOKEN( "active-split-range",              XML_ACTIVE_SPLIT_RANGE ),
-        TOKEN( "active-table",                    XML_ACTIVE_TABLE ),
-        TOKEN( "actuate",                         XML_ACTUATE ),
-        TOKEN( "add-in",                          XML_ADD_IN ),
-        TOKEN( "add-in-name",                     XML_ADD_IN_NAME ),
-        TOKEN( "address",                         XML_ADDRESS ),
-        TOKEN( "adjustment",                      XML_ADJUSTMENT ),
-        TOKEN( "algorithm",                       XML_ALGORITHM ),
-        TOKEN( "align",                           XML_ALIGN ),
-        TOKEN( "all",                             XML_ALL ),
-        TOKEN( "allow-empty-cell",                XML_ALLOW_EMPTY_CELL ),
-        TOKEN( "alphabetical-index",              XML_ALPHABETICAL_INDEX ),
-        TOKEN( "alphabetical-index-auto-mark-file",       
XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE ),
-        TOKEN( "alphabetical-index-entry-template",       
XML_ALPHABETICAL_INDEX_ENTRY_TEMPLATE ),
-        TOKEN( "alphabetical-index-mark",         XML_ALPHABETICAL_INDEX_MARK 
),
-        TOKEN( "alphabetical-index-mark-end",     
XML_ALPHABETICAL_INDEX_MARK_END ),
-        TOKEN( "alphabetical-index-mark-start",       
XML_ALPHABETICAL_INDEX_MARK_START ),
-        TOKEN( "alphabetical-index-source",       
XML_ALPHABETICAL_INDEX_SOURCE ),
-        TOKEN( "alphabetical-separators",         XML_ALPHABETICAL_SEPARATORS 
),
-        TOKEN( "alternate",                       XML_ALTERNATE ),
-        TOKEN( "am-pm",                           XML_AM_PM ),
-        TOKEN( "ambient-color",                   XML_AMBIENT_COLOR ),
-        TOKEN( "anchor-page-number",              XML_ANCHOR_PAGE_NUMBER ),
-        TOKEN( "anchor-type",                     XML_ANCHOR_TYPE ),
-        TOKEN( "and",                             XML_AND ),
-        TOKEN( "animation",                       XML_ANIMATION ),
-        TOKEN( "animation-delay",                 XML_ANIMATION_DELAY ),
-        TOKEN( "animation-direction",             XML_ANIMATION_DIRECTION ),
-        TOKEN( "animation-repeat",                XML_ANIMATION_REPEAT ),
-        TOKEN( "animation-start-inside",          XML_ANIMATION_START_INSIDE ),
-        TOKEN( "animation-steps",                 XML_ANIMATION_STEPS ),
-        TOKEN( "animation-stop-inside",           XML_ANIMATION_STOP_INSIDE ),
-        TOKEN( "animations",                      XML_ANIMATIONS ),
-        TOKEN( "annotation",                      XML_ANNOTATION ),
-        TOKEN( "annotation-end",                  XML_ANNOTATION_END ),
-        TOKEN( "annotations",                     XML_ANNOTATIONS ),
-        TOKEN( "annote",                          XML_ANNOTE ),
-        TOKEN( "appear",                          XML_APPEAR ),
-        TOKEN( "applet",                          XML_APPLET ),
-        TOKEN( "applet-name",                     XML_APPLET_NAME ),
-        TOKEN( "application-data",                XML_APPLICATION_DATA ),
-        TOKEN( "application-xml",                 XML_APPLICATION_XML ),
-        TOKEN( "apply",                           XML_APPLY ),
-        TOKEN( "apply-style-name",                XML_APPLY_STYLE_NAME ),
-        TOKEN( "aqua",                            XML_AQUA ),
-        TOKEN( "arc",                             XML_ARC ),
-        TOKEN( "arccos",                          XML_ARCCOS ),
-        TOKEN( "archive",                         XML_ARCHIVE ),
-        TOKEN( "arcsin",                          XML_ARCSIN ),
-        TOKEN( "arctan",                          XML_ARCTAN ),
-        TOKEN( "area",                            XML_AREA ),
-        TOKEN( "area-circle",                     XML_AREA_CIRCLE ),
-        TOKEN( "area-polygon",                    XML_AREA_POLYGON ),
-        TOKEN( "area-rectangle",                  XML_AREA_RECTANGLE ),
-        TOKEN( "article",                         XML_ARTICLE ),
-        TOKEN( "as-char",                         XML_AS_CHAR ),
-        TOKEN( "ascending",                       XML_ASCENDING ),
-        TOKEN( "attached-axis",                   XML_ATTACHED_AXIS ),
-        TOKEN( "attractive",                      XML_ATTRACTIVE ),
-        TOKEN( "author",                          XML_AUTHOR ),
-        TOKEN( "author-initials",                 XML_AUTHOR_INITIALS ),
-        TOKEN( "author-name",                     XML_AUTHOR_NAME ),
-        TOKEN( "auto",                            XML_AUTO ),
-        TOKEN( "auto-grow-height",                XML_AUTO_GROW_HEIGHT ),
-        TOKEN( "auto-grow-width",                 XML_AUTO_GROW_WIDTH ),
-        TOKEN( "auto-reload",                     XML_AUTO_RELOAD ),
-        TOKEN( "auto-text",                       XML_AUTO_TEXT ),
-        TOKEN( "auto-text-events",                XML_AUTO_TEXT_EVENTS ),
-        TOKEN( "auto-text-group",                 XML_AUTO_TEXT_GROUP ),
-        TOKEN( "auto-text-indent",                XML_AUTO_TEXT_INDENT ),
-        TOKEN( "auto-update",                     XML_AUTO_UPDATE ),
-        TOKEN( "automatic",                       XML_AUTOMATIC ),
-        TOKEN( "automatic-find-labels",           XML_AUTOMATIC_FIND_LABELS ),
-        TOKEN( "automatic-order",                 XML_AUTOMATIC_ORDER ),
-        TOKEN( "automatic-styles",                XML_AUTOMATIC_STYLES ),
-        TOKEN( "automatic-update",                XML_AUTOMATIC_UPDATE ),
-        TOKEN( "autosize",                        XML_AUTOSIZE ),
-        TOKEN( "average",                         XML_AVERAGE ),
-        TOKEN( "axis",                            XML_AXIS ),
-        TOKEN( "axis-color",                      XML_AXIS_COLOR ),
-        TOKEN( "back-scale",                      XML_BACK_SCALE ),
-        TOKEN( "backface-culling",                XML_BACKFACE_CULLING ),
-        TOKEN( "background",                      XML_BACKGROUND ),
-        TOKEN( "background-color",                XML_BACKGROUND_COLOR ),
-        TOKEN( "background-image",                XML_BACKGROUND_IMAGE ),
-        TOKEN( "no-repeat",                       XML_BACKGROUND_NO_REPEAT ),
-        TOKEN( "repeat",                          XML_BACKGROUND_REPEAT ),
-        TOKEN( "stretch",                         XML_BACKGROUND_STRETCH ),
-        TOKEN( "bar",                             XML_BAR ),
-        TOKEN( "base64Binary",                    XML_BASE64BINARY ),
-        TOKEN( "base-cell-address",               XML_BASE_CELL_ADDRESS ),
-        TOKEN( "baseline",                        XML_BASELINE ),
-        TOKEN( "before-date-time",                XML_BEFORE_DATE_TIME ),
-        TOKEN( "below",                           XML_BELOW ),
-        TOKEN( "between-date-times",              XML_BETWEEN_DATE_TIMES ),
-        TOKEN( "bevel",                           XML_BEVEL ),
-        TOKEN( "bevelled",                        XML_BEVELLED ),
-        TOKEN( "bibiliographic-type",             XML_BIBILIOGRAPHIC_TYPE ),
-        TOKEN( "bibliography",                    XML_BIBLIOGRAPHY ),
-        TOKEN( "bibliography-configuration",      
XML_BIBLIOGRAPHY_CONFIGURATION ),
-        TOKEN( "bibliography-data-field",         XML_BIBLIOGRAPHY_DATA_FIELD 
),
-        TOKEN( "bibliography-entry-template",     
XML_BIBLIOGRAPHY_ENTRY_TEMPLATE ),
-        TOKEN( "bibliography-mark",               XML_BIBLIOGRAPHY_MARK ),
-        TOKEN( "bibliography-source",             XML_BIBLIOGRAPHY_SOURCE ),
-        TOKEN( "bibliography-type",               XML_BIBLIOGRAPHY_TYPE ),
-        TOKEN( "bind-styles-to-content",          XML_BIND_STYLES_TO_CONTENT ),
-        TOKEN( "bitmap",                          XML_BITMAP ),
-        TOKEN( "black",                           XML_BLACK ),
-        TOKEN( "blend",                           XML_BLEND ),
-        TOKEN( "blinking",                        XML_BLINKING ),
-        TOKEN( "block",                           XML_BLOCK ),
-        TOKEN( "block-list",                      XML_BLOCK_LIST ),
-        TOKEN( "blue",                            XML_BLUE ),
-        TOKEN( "body",                            XML_BODY ),
-        TOKEN( "bold",                            XML_BOLD ),
-        TOKEN( "book",                            XML_BOOK ),
-        TOKEN( "booklet",                         XML_BOOKLET ),
-        TOKEN( "bookmark",                        XML_BOOKMARK ),
-        TOKEN( "bookmark-end",                    XML_BOOKMARK_END ),
-        TOKEN( "bookmark-ref",                    XML_BOOKMARK_REF ),
-        TOKEN( "bookmark-start",                  XML_BOOKMARK_START ),
-        TOKEN( "booktitle",                       XML_BOOKTITLE ),
-        TOKEN( "boolean",                         XML_BOOLEAN ),
-        TOKEN( "boolean-style",                   XML_BOOLEAN_STYLE ),
-        TOKEN( "boolean-value",                   XML_BOOLEAN_VALUE ),
-        TOKEN( "border",                          XML_BORDER ),
-        TOKEN( "border-bottom",                   XML_BORDER_BOTTOM ),
-        TOKEN( "border-color",                    XML_BORDER_COLOR ),
-        TOKEN( "border-left",                     XML_BORDER_LEFT ),
-        TOKEN( "border-line-width",               XML_BORDER_LINE_WIDTH ),
-        TOKEN( "border-line-width-bottom",        XML_BORDER_LINE_WIDTH_BOTTOM 
),
-        TOKEN( "border-line-width-left",          XML_BORDER_LINE_WIDTH_LEFT ),
-        TOKEN( "border-line-width-right",         XML_BORDER_LINE_WIDTH_RIGHT 
),
-        TOKEN( "border-line-width-top",           XML_BORDER_LINE_WIDTH_TOP ),
-        TOKEN( "border-right",                    XML_BORDER_RIGHT ),
-        TOKEN( "border-top",                      XML_BORDER_TOP ),
-        TOKEN( "both",                            XML_BOTH ),
-        TOKEN( "bottom",                          XML_BOTTOM ),
-        TOKEN( "bottom-left",                     XML_BOTTOM_LEFT ),
-        TOKEN( "bottom percent",                  XML_BOTTOM_PERCENT ),
-        TOKEN( "bottom-right",                    XML_BOTTOM_RIGHT ),
-        TOKEN( "bottom values",                   XML_BOTTOM_VALUES ),
-        TOKEN( "bottom-arc",                      XML_BOTTOMARC ),
-        TOKEN( "bottom-circle",                   XML_BOTTOMCIRCLE ),
-        TOKEN( "break-after",                     XML_BREAK_AFTER ),
-        TOKEN( "break-before",                    XML_BREAK_BEFORE ),
-        TOKEN( "break-inside",                    XML_BREAK_INSIDE ),
-        TOKEN( "bubble",                          XML_BUBBLE ),
-        TOKEN( "bullet-char",                     XML_BULLET_CHAR ),
-        TOKEN( "bullet-relative-size",            XML_BULLET_RELATIVE_SIZE ),
-        TOKEN( "butt",                            XML_BUTT ),
-        TOKEN( "button1",                         XML_BUTTON1 ),
-        TOKEN( "button2",                         XML_BUTTON2 ),
-        TOKEN( "button3",                         XML_BUTTON3 ),
-        TOKEN( "button4",                         XML_BUTTON4 ),
-        TOKEN( "buttons",                         XML_BUTTONS ),
-        TOKEN( "bvar",                            XML_BVAR ),
-        TOKEN( "c",                               XML_C ),
-        TOKEN( "calculation-settings",            XML_CALCULATION_SETTINGS ),
-        TOKEN( "calendar",                        XML_CALENDAR ),
-        TOKEN( "capitalize-entries",              XML_CAPITALIZE_ENTRIES ),
-        TOKEN( "caption",                         XML_CAPTION ),
-        TOKEN( "caption-point-x",                 XML_CAPTION_POINT_X ),
-        TOKEN( "caption-point-y",                 XML_CAPTION_POINT_Y ),
-        TOKEN( "caption-sequence-format",         XML_CAPTION_SEQUENCE_FORMAT 
),
-        TOKEN( "caption-sequence-name",           XML_CAPTION_SEQUENCE_NAME ),
-        TOKEN( "case-sensitive",                  XML_CASE_SENSITIVE ),
-        TOKEN( "capitalize",                      XML_CASEMAP_CAPITALIZE ),
-        TOKEN( "lowercase",                       XML_CASEMAP_LOWERCASE ),
-        TOKEN( "normal",                          XML_CASEMAP_NORMAL ),
-        TOKEN( "small-caps",                      XML_CASEMAP_SMALL_CAPS ),
-        TOKEN( "uppercase",                       XML_CASEMAP_UPPERCASE ),
-        TOKEN( "categories",                      XML_CATEGORIES ),
-        TOKEN( "category",                        XML_CATEGORY ),
-        TOKEN( "category-and-value",              XML_CATEGORY_AND_VALUE ),
-        TOKEN( "cell-address",                    XML_CELL_ADDRESS ),
-        TOKEN( "cell-content-change",             XML_CELL_CONTENT_CHANGE ),
-        TOKEN( "cell-content-deletion",           XML_CELL_CONTENT_DELETION ),
-        TOKEN( "cell-count",                      XML_CELL_COUNT ),
-        TOKEN( "cell-protect",                    XML_CELL_PROTECT ),
-        TOKEN( "cell-range-address",              XML_CELL_RANGE_ADDRESS ),
-        TOKEN( "cell-range-address-list",         XML_CELL_RANGE_ADDRESS_LIST 
),
-        TOKEN( "cell-range-source",               XML_CELL_RANGE_SOURCE ),
-        TOKEN( "center",                          XML_CENTER ),
-        TOKEN( "chain-next-name",                 XML_CHAIN_NEXT_NAME ),
-        TOKEN( "change",                          XML_CHANGE ),
-        TOKEN( "change-deletion",                 XML_CHANGE_DELETION ),
-        TOKEN( "change-end",                      XML_CHANGE_END ),
-        TOKEN( "change-id",                       XML_CHANGE_ID ),
-        TOKEN( "change-info",                     XML_CHANGE_INFO ),
-        TOKEN( "change-start",                    XML_CHANGE_START ),
-        TOKEN( "change-track-table-cell",         XML_CHANGE_TRACK_TABLE_CELL 
),
-        TOKEN( "change-view-conditions",          XML_CHANGE_VIEW_CONDITIONS ),
-        TOKEN( "change-view-settings",            XML_CHANGE_VIEW_SETTINGS ),
-        TOKEN( "changed-region",                  XML_CHANGED_REGION ),
-        TOKEN( "chapter",                         XML_CHAPTER ),
-        TOKEN( "char",                            XML_CHAR ),
-        TOKEN( "char-shading-value",              XML_CHAR_SHADING_VALUE ),
-        TOKEN( "character-count",                 XML_CHARACTER_COUNT ),
-        TOKEN( "chart",                           XML_CHART ),
-        TOKEN( "charts",                          XML_CHARTS ),
-        TOKEN( "checkerboard",                    XML_CHECKERBOARD ),
-        TOKEN( "chg-author",                      XML_CHG_AUTHOR ),
-        TOKEN( "chg-comment",                     XML_CHG_COMMENT ),
-        TOKEN( "chg-date-time",                   XML_CHG_DATE_TIME ),
-        TOKEN( "ci",                              XML_CI ),
-        TOKEN( "circle",                          XML_CIRCLE ),
-        TOKEN( "citation-body-style-name",        XML_CITATION_BODY_STYLE_NAME 
),
-        TOKEN( "citation-style-name",             XML_CITATION_STYLE_NAME ),
-        TOKEN( "class",                           XML_CLASS ),
-        TOKEN( "class-id",                        XML_CLASS_ID ),
-        TOKEN( "clip",                            XML_CLIP ),
-        TOKEN( "clockwise",                       XML_CLOCKWISE ),
-        TOKEN( "close",                           XML_CLOSE ),
-        TOKEN( "close-horizontal",                XML_CLOSE_HORIZONTAL ),
-        TOKEN( "close-vertical",                  XML_CLOSE_VERTICAL ),
-        TOKEN( "cm",                              XML_CM ),
-        TOKEN( "cn",                              XML_CN ),
-        TOKEN( "code",                            XML_CODE ),
-        TOKEN( "codebase",                        XML_CODEBASE ),
-        TOKEN( "collapse",                        XML_COLLAPSE ),
-        TOKEN( "color",                           XML_COLOR ),
-        TOKEN( "color-inversion",                 XML_COLOR_INVERSION ),
-        TOKEN( "color-mode",                      XML_COLOR_MODE ),
-        TOKEN( "color-scale",                     XML_COLOR_SCALE ),
-        TOKEN( "color-scale-entry",               XML_COLOR_SCALE_ENTRY ),
-        TOKEN( "column",                          XML_COLUMN ),
-        TOKEN( "column-count",                    XML_COLUMN_COUNT ),
-        TOKEN( "column-gap",                      XML_COLUMN_GAP ),
-        TOKEN( "column-name",                     XML_COLUMN_NAME ),
-        TOKEN( "column-sep",                      XML_COLUMN_SEP ),
-        TOKEN( "column-width",                    XML_COLUMN_WIDTH ),
-        TOKEN( "columnalign",                     XML_COLUMNALIGN ),
-        TOKEN( "columns",                         XML_COLUMNS ),
-        TOKEN( "auto",                            XML_COLUMNSPLIT_AUTO ),
-        TOKEN( "avoid",                           XML_COLUMNSPLIT_AVOID ),
-        TOKEN( "combine-entries",                 XML_COMBINE_ENTRIES ),
-        TOKEN( "combine-entries-with-dash",       
XML_COMBINE_ENTRIES_WITH_DASH ),
-        TOKEN( "combine-entries-with-pp",         XML_COMBINE_ENTRIES_WITH_PP 
),
-        TOKEN( "comma-separated",                 XML_COMMA_SEPARATED ),
-        TOKEN( "command",                         XML_COMMAND ),
-        TOKEN( "comment",                         XML_COMMENT ),
-        TOKEN( "compose",                         XML_COMPOSE ),
-        TOKEN( "cond-style-name",                 XML_COND_STYLE_NAME ),
-        TOKEN( "condition",                       XML_CONDITION ),
-        TOKEN( "condition-source",                XML_CONDITION_SOURCE ),
-        TOKEN( "condition-source-range-address",      
XML_CONDITION_SOURCE_RANGE_ADDRESS ),
-        TOKEN( "conditional-text",                XML_CONDITIONAL_TEXT ),
-        TOKEN( "conditional-format",              XML_CONDITIONAL_FORMAT ),
-        TOKEN( "conditional-formats",             XML_CONDITIONAL_FORMATS ),
-        TOKEN( "cone",                            XML_CONE ),
-        TOKEN( "conference",                      XML_CONFERENCE ),
-        TOKEN( "config-item",                     XML_CONFIG_ITEM ),
-        TOKEN( "config-item-map-entry",           XML_CONFIG_ITEM_MAP_ENTRY ),
-        TOKEN( "config-item-map-indexed",         XML_CONFIG_ITEM_MAP_INDEXED 
),
-        TOKEN( "config-item-map-named",           XML_CONFIG_ITEM_MAP_NAMED ),
-        TOKEN( "config-item-set",                 XML_CONFIG_ITEM_SET ),
-        TOKEN( "configuration-settings",          XML_CONFIGURATION_SETTINGS ),
-        TOKEN( "conjugate",                       XML_CONJUGATE ),
-        TOKEN( "connect-bars",                    XML_CONNECT_BARS ),
-        TOKEN( "connection-name",                 XML_CONNECTION_NAME ),
-        TOKEN( "connector",                       XML_CONNECTOR ),
-        TOKEN( "consecutive-numbering",           XML_CONSECUTIVE_NUMBERING ),
-        TOKEN( "consolidation",                   XML_CONSOLIDATION ),
-        TOKEN( "constant",                        XML_CONSTANT ),
-        TOKEN( "contains-error",                  XML_CONTAINS_ERROR ),
-        TOKEN( "contains-header",                 XML_CONTAINS_HEADER ),
-        TOKEN( "content",                         XML_CONTENT ),
-        TOKEN( "content-validation",              XML_CONTENT_VALIDATION ),
-        TOKEN( "content-validation-name",         XML_CONTENT_VALIDATION_NAME 
),
-        TOKEN( "content-validations",             XML_CONTENT_VALIDATIONS ),
-        TOKEN( "contextual-spacing",              XML_CONTEXTUAL_SPACING ),
-        TOKEN( "continue",                        XML_CONTINUE ),
-        TOKEN( "continue-numbering",              XML_CONTINUE_NUMBERING ),
-        TOKEN( "contour-path",                    XML_CONTOUR_PATH ),
-        TOKEN( "contour-polygon",                 XML_CONTOUR_POLYGON ),
-        TOKEN( "contrast",                        XML_CONTRAST ),
-        TOKEN( "control",                         XML_CONTROL ),
-        TOKEN( "conversion-mode",                 XML_CONVERSION_MODE ),
-        TOKEN( "copy-back",                       XML_COPY_BACK ),
-        TOKEN( "copy-formulas",                   XML_COPY_FORMULAS ),
-        TOKEN( "copy-outline-levels",             XML_COPY_OUTLINE_LEVELS ),
-        TOKEN( "copy-results-only",               XML_COPY_RESULTS_ONLY ),
-        TOKEN( "copy-styles",                     XML_COPY_STYLES ),
-        TOKEN( "corner-radius",                   XML_CORNER_RADIUS ),
-        TOKEN( "correct",                         XML_CORRECT ),
-        TOKEN( "cos",                             XML_COS ),
-        TOKEN( "cosh",                            XML_COSH ),
-        TOKEN( "cot",                             XML_COT ),
-        TOKEN( "coth",                            XML_COTH ),
-        TOKEN( "count",                           XML_COUNT ),
-        TOKEN( "count-empty-lines",               XML_COUNT_EMPTY_LINES ),
-        TOKEN( "count-in-floating-frames",        XML_COUNT_IN_FLOATING_FRAMES 
),
-        TOKEN( "counter-clockwise",               XML_COUNTER_CLOCKWISE ),
-        TOKEN( "counterclockwise",                XML_COUNTERCLOCKWISE ),
-        TOKEN( "countnums",                       XML_COUNTNUMS ),
-        TOKEN( "country",                         XML_COUNTRY ),
-        TOKEN( "country-asian",                   XML_COUNTRY_ASIAN ),
-        TOKEN( "country-complex",                 XML_COUNTRY_COMPLEX ),
-        TOKEN( "covered-table-cell",              XML_COVERED_TABLE_CELL ),
-        TOKEN( "create-date",                     XML_CREATE_DATE ),
-        TOKEN( "create-date-string",              XML_CREATE_DATE_STRING ),
-        TOKEN( "creation-date",                   XML_CREATION_DATE ),
-        TOKEN( "creation-time",                   XML_CREATION_TIME ),
-        TOKEN( "creator",                         XML_CREATOR ),
-        TOKEN( "csc",                             XML_CSC ),
-        TOKEN( "csch",                            XML_CSCH ),
-        TOKEN( "cube",                            XML_CUBE ),
-        TOKEN( "cuboid",                          XML_CUBOID ),
-        TOKEN( "currency",                        XML_CURRENCY ),
-        TOKEN( "currency-style",                  XML_CURRENCY_STYLE ),
-        TOKEN( "currency-symbol",                 XML_CURRENCY_SYMBOL ),
-        TOKEN( "current",                         XML_CURRENT ),
-        TOKEN( "current-value",                   XML_CURRENT_VALUE ),
-        TOKEN( "cursor-position",                 XML_CURSOR_POSITION ),
-        TOKEN( "cursor-position-x",               XML_CURSOR_POSITION_X ),
-        TOKEN( "cursor-position-y",               XML_CURSOR_POSITION_Y ),
-        TOKEN( "curve",                           XML_CURVE ),
-        TOKEN( "custom1",                         XML_CUSTOM1 ),
-        TOKEN( "custom2",                         XML_CUSTOM2 ),
-        TOKEN( "custom3",                         XML_CUSTOM3 ),
-        TOKEN( "custom4",                         XML_CUSTOM4 ),
-        TOKEN( "custom5",                         XML_CUSTOM5 ),
-        TOKEN( "cut",                             XML_CUT ),
-        TOKEN( "cut-offs",                        XML_CUT_OFFS ),
-        TOKEN( "cx",                              XML_CX ),
-        TOKEN( "cy",                              XML_CY ),
-        TOKEN( "cylinder",                        XML_CYLINDER ),
-        TOKEN( "d",                               XML_D ),
-        TOKEN( "dash",                            XML_DASH ),
-        TOKEN( "dash-dot",                        XML_DASH_DOT ),
-        TOKEN( "dash-dot-dot",                    XML_DASH_DOT_DOT ),
-        TOKEN( "dashed",                          XML_DASHED ),
-        TOKEN( "data",                            XML_DATA ),
-        TOKEN( "data-bar",                        XML_DATA_BAR ),
-        TOKEN( "data-bar-entry",                  XML_DATA_BAR_ENTRY ),
-        TOKEN( "data-cell-range-address",         XML_DATA_CELL_RANGE_ADDRESS 
),
-        TOKEN( "data-label-number",               XML_DATA_LABEL_NUMBER ),
-        TOKEN( "data-label-symbol",               XML_DATA_LABEL_SYMBOL ),
-        TOKEN( "data-label-text",                 XML_DATA_LABEL_TEXT ),
-        TOKEN( "data-pilot-field",                XML_DATA_PILOT_FIELD ),
-        TOKEN( "data-pilot-grand-total",          XML_DATA_PILOT_GRAND_TOTAL ),
-        TOKEN( "data-pilot-level",                XML_DATA_PILOT_LEVEL ),
-        TOKEN( "data-pilot-member",               XML_DATA_PILOT_MEMBER ),
-        TOKEN( "data-pilot-members",              XML_DATA_PILOT_MEMBERS ),
-        TOKEN( "data-pilot-subtotal",             XML_DATA_PILOT_SUBTOTAL ),
-        TOKEN( "data-pilot-subtotals",            XML_DATA_PILOT_SUBTOTALS ),
-        TOKEN( "data-pilot-table",                XML_DATA_PILOT_TABLE ),
-        TOKEN( "data-pilot-tables",               XML_DATA_PILOT_TABLES ),
-        TOKEN( "data-point",                      XML_DATA_POINT ),
-        TOKEN( "data-stream-source",              XML_DATA_STREAM_SOURCE ),
-        TOKEN( "data-style",                      XML_DATA_STYLE ),
-        TOKEN( "data-style-name",                 XML_DATA_STYLE_NAME ),
-        TOKEN( "data-type",                       XML_DATA_TYPE ),
-        TOKEN( "database-display",                XML_DATABASE_DISPLAY ),
-        TOKEN( "database-name",                   XML_DATABASE_NAME ),
-        TOKEN( "database-next",                   XML_DATABASE_NEXT ),
-        TOKEN( "database-range",                  XML_DATABASE_RANGE ),
-        TOKEN( "database-ranges",                 XML_DATABASE_RANGES ),
-        TOKEN( "database-row-number",             XML_DATABASE_ROW_NUMBER ),
-        TOKEN( "database-select",                 XML_DATABASE_SELECT ),
-        TOKEN( "database-source-query",           XML_DATABASE_SOURCE_QUERY ),
-        TOKEN( "database-source-sql",             XML_DATABASE_SOURCE_SQL ),
-        TOKEN( "database-source-table",           XML_DATABASE_SOURCE_TABLE ),
-        TOKEN( "date",                            XML_DATE ),
-        TOKEN( "date-is",                         XML_DATE_IS ),
-        TOKEN( "date-adjust",                     XML_DATE_ADJUST ),
-        TOKEN( "date-style",                      XML_DATE_STYLE ),
-        TOKEN( "date-time",                       XML_DATE_TIME ),
-        TOKEN( "date-value",                      XML_DATE_VALUE ),
-        TOKEN( "datetime",                        XML_DATETIME ),
-        TOKEN( "day",                             XML_DAY ),
-        TOKEN( "day-of-week",                     XML_DAY_OF_WEEK ),
-        TOKEN( "dde-application",                 XML_DDE_APPLICATION ),
-        TOKEN( "dde-connection",                  XML_DDE_CONNECTION ),
-        TOKEN( "dde-connection-decl",             XML_DDE_CONNECTION_DECL ),
-        TOKEN( "dde-connection-decls",            XML_DDE_CONNECTION_DECLS ),
-        TOKEN( "dde-item",                        XML_DDE_ITEM ),
-        TOKEN( "dde-link",                        XML_DDE_LINK ),
-        TOKEN( "dde-links",                       XML_DDE_LINKS ),
-        TOKEN( "dde-source",                      XML_DDE_SOURCE ),
-        TOKEN( "dde-topic",                       XML_DDE_TOPIC ),
-        TOKEN( "decimal-places",                  XML_DECIMAL_PLACES ),
-        TOKEN( "decimal-replacement",             XML_DECIMAL_REPLACEMENT ),
-        TOKEN( "declare",                         XML_DECLARE ),
-        TOKEN( "decorate-words-only",             XML_DECORATE_WORDS_ONLY ),
-        TOKEN( "decorative",                      XML_DECORATIVE ),
-        TOKEN( "deep",                            XML_DEEP ),
-        TOKEN( "default",                         XML_DEFAULT ),
-        TOKEN( "default-cell-style-name",         XML_DEFAULT_CELL_STYLE_NAME 
),
-        TOKEN( "default-style",                   XML_DEFAULT_STYLE ),
-        TOKEN( "default-style-name",              XML_DEFAULT_STYLE_NAME ),
-        TOKEN( "degree",                          XML_DEGREE ),
-        TOKEN( "delay",                           XML_DELAY ),
-        TOKEN( "deletion",                        XML_DELETION ),
-        TOKEN( "deletions",                       XML_DELETIONS ),
-        TOKEN( "denomalign"       ,               XML_DENOMALIGN ),
-        TOKEN( "denominator-value",               XML_DENOMINATOR_VALUE ),
-        TOKEN( "dependence",                      XML_DEPENDENCE ),
-        TOKEN( "dependences",                     XML_DEPENDENCES ),
-        TOKEN( "dependencies",                    XML_DEPENDENCIES ),
-        TOKEN( "depth",                           XML_DEPTH ),
-        TOKEN( "desc",                            XML_DESC ),
-        TOKEN( "descending",                      XML_DESCENDING ),
-        TOKEN( "description",                     XML_DESCRIPTION ),
-        TOKEN( "detective",                       XML_DETECTIVE ),
-        TOKEN( "determinant",                     XML_DETERMINANT ),
-        TOKEN( "diff",                            XML_DIFF ),
-        TOKEN( "diffuse-color",                   XML_DIFFUSE_COLOR ),
-        TOKEN( "dim",                             XML_DIM ),
-        TOKEN( "direction",                       XML_DIRECTION ),
-        TOKEN( "disabled",                        XML_DISABLED ),
-        TOKEN( "disc",                            XML_DISC ),
-        TOKEN( "display",                         XML_DISPLAY ),
-        TOKEN( "display-border",                  XML_DISPLAY_BORDER ),
-        TOKEN( "display-details",                 XML_DISPLAY_DETAILS ),
-        TOKEN( "display-duplicates",              XML_DISPLAY_DUPLICATES ),
-        TOKEN( "display-empty",                   XML_DISPLAY_EMPTY ),
-        TOKEN( "display-filter-buttons",          XML_DISPLAY_FILTER_BUTTONS ),
-        TOKEN( "display-formula",                 XML_DISPLAY_FORMULA ),
-        TOKEN( "display-label",                   XML_DISPLAY_LABEL ),
-        TOKEN( "display-levels",                  XML_DISPLAY_LEVELS ),
-        TOKEN( "display-name",                    XML_DISPLAY_NAME ),
-        TOKEN( "display-outline-level",           XML_DISPLAY_OUTLINE_LEVEL ),
-        TOKEN( "dissolve",                        XML_DISSOLVE ),
-        TOKEN( "distance",                        XML_DISTANCE ),
-        TOKEN( "distance-after-sep",              XML_DISTANCE_AFTER_SEP ),
-        TOKEN( "distance-before-sep",             XML_DISTANCE_BEFORE_SEP ),
-        TOKEN( "distribute",                      XML_DISTRIBUTE ),
-        TOKEN( "distribute-letter",               XML_DISTRIBUTE_LETTER ),
-        TOKEN( "distribute-space",                XML_DISTRIBUTE_SPACE ),
-        TOKEN( "divide",                          XML_DIVIDE ),
-        TOKEN( "document",                        XML_DOCUMENT ),
-        TOKEN( "document-content",                XML_DOCUMENT_CONTENT ),
-        TOKEN( "document-meta",                   XML_DOCUMENT_META ),
-        TOKEN( "document-settings",               XML_DOCUMENT_SETTINGS ),
-        TOKEN( "document-statistic",              XML_DOCUMENT_STATISTIC ),
-        TOKEN( "document-styles",                 XML_DOCUMENT_STYLES ),
-        TOKEN( "domain",                          XML_DOMAIN ),
-        TOKEN( "dot",                             XML_DOT ),
-        TOKEN( "dots1",                           XML_DOTS1 ),
-        TOKEN( "dots1-length",                    XML_DOTS1_LENGTH ),
-        TOKEN( "dots2",                           XML_DOTS2 ),
-        TOKEN( "dots2-length",                    XML_DOTS2_LENGTH ),
-        TOKEN( "dotted",                          XML_DOTTED ),
-        TOKEN( "double",                          XML_DOUBLE ),
-        TOKEN( "double-sided",                    XML_DOUBLE_SIDED ),
-        TOKEN( "double-thin",                     XML_DOUBLE_THIN ),
-        TOKEN( "down",                            XML_DOWN ),
-        TOKEN( "draft",                           XML_DRAFT ),
-        TOKEN( "draw",                            XML_DRAW ),
-        TOKEN( "ole-draw-aspect",                 XML_DRAW_ASPECT ),
-        TOKEN( "drawing",                         XML_DRAWING ),
-        TOKEN( "drawings",                        XML_DRAWINGS ),
-        TOKEN( "drawpool",                        XML_DRAWPOOL ),
-        TOKEN( "drop-cap",                        XML_DROP_CAP ),
-        TOKEN( "dynamic",                         XML_DYNAMIC ),
-        TOKEN( "edge-rounding",                   XML_EDGE_ROUNDING ),
-        TOKEN( "editable",                        XML_EDITABLE ),
-        TOKEN( "editing-cycles",                  XML_EDITING_CYCLES ),
-        TOKEN( "editing-duration",                XML_EDITING_DURATION ),
-        TOKEN( "edition",                         XML_EDITION ),
-        TOKEN( "editor",                          XML_EDITOR ),
-        TOKEN( "effect",                          XML_EFFECT ),
-        TOKEN( "ellipse",                         XML_ELLIPSE ),
-        TOKEN( "email",                           XML_EMAIL ),
-        TOKEN( "embed",                           XML_EMBED ),
-        TOKEN( "embedded-visible-area",           XML_EMBEDDED_VISIBLE_AREA ),
-        TOKEN( "embossed",                        XML_EMBOSSED ),
-        TOKEN( "emissive-color",                  XML_EMISSIVE_COLOR ),
-        TOKEN( "empty",                           XML_EMPTY ),
-        TOKEN( "empty-line-refresh",              XML_EMPTY_LINE_REFRESH ),
-        TOKEN( "enable-numbering",                XML_ENABLE_NUMBERING ),
-        TOKEN( "enabled",                         XML_ENABLED ),
-        TOKEN( "encoding",                        XML_ENCODING ),
-        TOKEN( "end",                             XML_END ),
-        TOKEN( "end-angle",                       XML_END_ANGLE ),
-        TOKEN( "end-cell-address",                XML_END_CELL_ADDRESS ),
-        TOKEN( "end-color",                       XML_END_COLOR ),
-        TOKEN( "end-column",                      XML_END_COLUMN ),
-        TOKEN( "end-glue-point",                  XML_END_GLUE_POINT ),
-        TOKEN( "end-guide",                       XML_END_GUIDE ),
-        TOKEN( "end-intensity",                   XML_END_INTENSITY ),
-        TOKEN( "end-line-spacing-horizontal",     
XML_END_LINE_SPACING_HORIZONTAL ),
-        TOKEN( "end-line-spacing-vertical",       
XML_END_LINE_SPACING_VERTICAL ),
-        TOKEN( "end-position",                    XML_END_POSITION ),
-        TOKEN( "end-row",                         XML_END_ROW ),
-        TOKEN( "end-shape",                       XML_END_SHAPE ),
-        TOKEN( "end-table",                       XML_END_TABLE ),
-        TOKEN( "end-x",                           XML_END_X ),
-        TOKEN( "end-y",                           XML_END_Y ),
-        TOKEN( "endless",                         XML_ENDLESS ),
-        TOKEN( "endnote",                         XML_ENDNOTE ),
-        TOKEN( "endnote-body",                    XML_ENDNOTE_BODY ),
-        TOKEN( "endnote-citation",                XML_ENDNOTE_CITATION ),
-        TOKEN( "endnote-ref",                     XML_ENDNOTE_REF ),
-        TOKEN( "endnotes-configuration",          XML_ENDNOTES_CONFIGURATION ),
-        TOKEN( "engraved",                        XML_ENGRAVED ),
-        TOKEN( "eq",                              XML_EQ ),
-        TOKEN( "equal-author",                    XML_EQUAL_AUTHOR ),
-        TOKEN( "equal-comment",                   XML_EQUAL_COMMENT ),
-        TOKEN( "equal-date",                      XML_EQUAL_DATE ),
-        TOKEN( "era",                             XML_ERA ),
-        TOKEN( "ergo-sum",                        XML_ERGO_SUM ),
-        TOKEN( "error-category",                  XML_ERROR_CATEGORY ),
-        TOKEN( "error-lower-indicator",           XML_ERROR_LOWER_INDICATOR ),
-        TOKEN( "error-lower-limit",               XML_ERROR_LOWER_LIMIT ),
-        TOKEN( "error-macro",                     XML_ERROR_MACRO ),
-        TOKEN( "error-margin",                    XML_ERROR_MARGIN ),
-        TOKEN( "error-message",                   XML_ERROR_MESSAGE ),
-        TOKEN( "error-percentage",                XML_ERROR_PERCENTAGE ),
-        TOKEN( "error-upper-indicator",           XML_ERROR_UPPER_INDICATOR ),
-        TOKEN( "error-upper-limit",               XML_ERROR_UPPER_LIMIT ),
-        TOKEN( "sub",                             XML_ESCAPEMENT_SUB ),
-        TOKEN( "super",                           XML_ESCAPEMENT_SUPER ),
-        TOKEN( "even-page",                       XML_EVEN_PAGE ),
-        TOKEN( "event",                           XML_EVENT ),
-        TOKEN( "event-name",                      XML_EVENT_NAME ),
-        TOKEN( "events",                          XML_EVENTS ),
-        TOKEN( "execute",                         XML_EXECUTE ),
-        TOKEN( "execute-macro",                   XML_EXECUTE_MACRO ),
-        TOKEN( "exists",                          XML_EXISTS ),
-        TOKEN( "exp",                             XML_EXP ),
-        TOKEN( "exponential",                     XML_EXPONENTIAL ),
-        TOKEN( "expression",                      XML_EXPRESSION ),
-        TOKEN( "extra",                           XML_EXTRA ),
-        TOKEN( "extrude",                         XML_EXTRUDE ),
-        TOKEN( "factorial",                       XML_FACTORIAL ),
-        TOKEN( "fade",                            XML_FADE ),
-        TOKEN( "fade-from-bottom",                XML_FADE_FROM_BOTTOM ),
-        TOKEN( "fade-from-center",                XML_FADE_FROM_CENTER ),
-        TOKEN( "fade-from-left",                  XML_FADE_FROM_LEFT ),
-        TOKEN( "fade-from-lowerleft",             XML_FADE_FROM_LOWERLEFT ),
-        TOKEN( "fade-from-lowerright",            XML_FADE_FROM_LOWERRIGHT ),
-        TOKEN( "fade-from-right",                 XML_FADE_FROM_RIGHT ),
-        TOKEN( "fade-from-top",                   XML_FADE_FROM_TOP ),
-        TOKEN( "fade-from-upperleft",             XML_FADE_FROM_UPPERLEFT ),
-        TOKEN( "fade-from-upperright",            XML_FADE_FROM_UPPERRIGHT ),
-        TOKEN( "fade-out",                        XML_FADE_OUT ),
-        TOKEN( "fade-to-center",                  XML_FADE_TO_CENTER ),
-        TOKEN( "false",                           XML_FALSE ),
-        TOKEN( "family",                          XML_FAMILY ),
-        TOKEN( "fast",                            XML_FAST ),
-        TOKEN( "fence",                           XML_FENCE ),
-        TOKEN( "field-number",                    XML_FIELD_NUMBER ),
-        TOKEN( "file-name",                       XML_FILE_NAME ),
-        TOKEN( "fill",                            XML_FILL ),
-        TOKEN( "fill-character",                  XML_FILL_CHARACTER ),
-        TOKEN( "fill-color",                      XML_FILL_COLOR ),
-        TOKEN( "fill-gradient-name",              XML_FILL_GRADIENT_NAME ),
-        TOKEN( "fill-hatch-name",                 XML_FILL_HATCH_NAME ),
-        TOKEN( "fill-hatch-solid",                XML_FILL_HATCH_SOLID ),
-        TOKEN( "fill-image",                      XML_FILL_IMAGE ),
-        TOKEN( "fill-image-height",               XML_FILL_IMAGE_HEIGHT ),
-        TOKEN( "fill-image-name",                 XML_FILL_IMAGE_NAME ),
-        TOKEN( "fill-image-ref-point",            XML_FILL_IMAGE_REF_POINT ),
-        TOKEN( "fill-image-ref-point-x",          XML_FILL_IMAGE_REF_POINT_X ),
-        TOKEN( "fill-image-ref-point-y",          XML_FILL_IMAGE_REF_POINT_Y ),
-        TOKEN( "fill-image-width",                XML_FILL_IMAGE_WIDTH ),
-        TOKEN( "filter",                          XML_FILTER ),
-        TOKEN( "filter-and",                      XML_FILTER_AND ),
-        TOKEN( "filter-condition",                XML_FILTER_CONDITION ),
-        TOKEN( "filter-name",                     XML_FILTER_NAME ),
-        TOKEN( "filter-options",                  XML_FILTER_OPTIONS ),
-        TOKEN( "filter-or",                       XML_FILTER_OR ),
-        TOKEN( "filter-set-item",                 XML_FILTER_SET_ITEM ),
-        TOKEN( "fine-dashed",                     XML_FINE_DASHED ),
-        TOKEN( "first-date-time",                 XML_FIRST_DATE_TIME ),
-        TOKEN( "first-page",                      XML_FIRST_PAGE ),
-        TOKEN( "first-page-number",               XML_FIRST_PAGE_NUMBER ),
-        TOKEN( "fit-to-contour",                  XML_FIT_TO_CONTOUR ),
-        TOKEN( "fit-to-size",                     XML_FIT_TO_SIZE ),
-        TOKEN( "fix",                             XML_FIX ),
-        TOKEN( "fixed",                           XML_FIXED ),
-        TOKEN( "flat",                            XML_FLAT ),
-        TOKEN( "float",                           XML_FLOAT ),
-        TOKEN( "floating-frame",                  XML_FLOATING_FRAME ),
-        TOKEN( "floor",                           XML_FLOOR ),
-        TOKEN( "fn",                              XML_FN ),
-        TOKEN( "focal-length",                    XML_FOCAL_LENGTH ),
-        TOKEN( "font-char-width",                 XML_FONT_CHAR_WIDTH ),
-        TOKEN( "font-charset",                    XML_FONT_CHARSET ),
-        TOKEN( "font-charset-asian",              XML_FONT_CHARSET_ASIAN ),
-        TOKEN( "font-charset-complex",            XML_FONT_CHARSET_COMPLEX ),
-        TOKEN( "font-color",                      XML_FONT_COLOR ),
-        TOKEN( "font-decl",                       XML_FONT_DECL ),
-        TOKEN( "font-decls",                      XML_FONT_DECLS ),
-        TOKEN( "font-family",                     XML_FONT_FAMILY ),
-        TOKEN( "font-family-asian",               XML_FONT_FAMILY_ASIAN ),
-        TOKEN( "font-family-complex",             XML_FONT_FAMILY_COMPLEX ),
-        TOKEN( "font-family-generic",             XML_FONT_FAMILY_GENERIC ),
-        TOKEN( "font-family-generic-asian",       
XML_FONT_FAMILY_GENERIC_ASIAN ),
-        TOKEN( "font-family-generic-complex",     
XML_FONT_FAMILY_GENERIC_COMPLEX ),
-        TOKEN( "font-kerning",                    XML_FONT_KERNING ),
-        TOKEN( "font-name",                       XML_FONT_NAME ),
-        TOKEN( "font-name-asian",                 XML_FONT_NAME_ASIAN ),
-        TOKEN( "font-name-complex",               XML_FONT_NAME_COMPLEX ),
-        TOKEN( "font-pitch",                      XML_FONT_PITCH ),
-        TOKEN( "font-pitch-asian",                XML_FONT_PITCH_ASIAN ),
-        TOKEN( "font-pitch-complex",              XML_FONT_PITCH_COMPLEX ),
-        TOKEN( "font-relief",                     XML_FONT_RELIEF ),
-        TOKEN( "font-size",                       XML_FONT_SIZE ),
-        TOKEN( "font-size-asian",                 XML_FONT_SIZE_ASIAN ),
-        TOKEN( "font-size-complex",               XML_FONT_SIZE_COMPLEX ),
-        TOKEN( "font-size-rel",                   XML_FONT_SIZE_REL ),
-        TOKEN( "font-size-rel-asian",             XML_FONT_SIZE_REL_ASIAN ),
-        TOKEN( "font-size-rel-complex",           XML_FONT_SIZE_REL_COMPLEX ),
-        TOKEN( "font-style",                      XML_FONT_STYLE ),
-        TOKEN( "font-style-asian",                XML_FONT_STYLE_ASIAN ),
-        TOKEN( "font-style-complex",              XML_FONT_STYLE_COMPLEX ),
-        TOKEN( "font-style-name",                 XML_FONT_STYLE_NAME ),
-        TOKEN( "font-style-name-asian",           XML_FONT_STYLE_NAME_ASIAN ),
-        TOKEN( "font-style-name-complex",         XML_FONT_STYLE_NAME_COMPLEX 
),
-        TOKEN( "font-variant",                    XML_FONT_VARIANT ),
-        TOKEN( "font-weight",                     XML_FONT_WEIGHT ),
-        TOKEN( "font-weight-asian",               XML_FONT_WEIGHT_ASIAN ),
-        TOKEN( "font-weight-complex",             XML_FONT_WEIGHT_COMPLEX ),
-        TOKEN( "font-width",                      XML_FONT_WIDTH ),
-        TOKEN( "font-word-line-mode",             XML_FONT_WORD_LINE_MODE ),
-        TOKEN( "fontfamily",                      XML_FONTFAMILY ),
-        TOKEN( "fontsize",                        XML_FONTSIZE ),
-        TOKEN( "fontstyle",                       XML_FONTSTYLE ),
-        TOKEN( "fontweight",                      XML_FONTWEIGHT ),
-        TOKEN( "fontwork-adjust",                 XML_FONTWORK_ADJUST ),
-        TOKEN( "fontwork-distance",               XML_FONTWORK_DISTANCE ),
-        TOKEN( "fontwork-form",                   XML_FONTWORK_FORM ),
-        TOKEN( "fontwork-hide-form",              XML_FONTWORK_HIDE_FORM ),
-        TOKEN( "fontwork-mirror",                 XML_FONTWORK_MIRROR ),
-        TOKEN( "fontwork-outline",                XML_FONTWORK_OUTLINE ),
-        TOKEN( "fontwork-shadow",                 XML_FONTWORK_SHADOW ),
-        TOKEN( "fontwork-shadow-color",           XML_FONTWORK_SHADOW_COLOR ),
-        TOKEN( "fontwork-shadow-offset-x",        XML_FONTWORK_SHADOW_OFFSET_X 
),
-        TOKEN( "fontwork-shadow-offset-y",        XML_FONTWORK_SHADOW_OFFSET_Y 
),
-        TOKEN( "fontwork-shadow-transparence",        
XML_FONTWORK_SHADOW_TRANSPARENCE ),
-        TOKEN( "fontwork-start",                  XML_FONTWORK_START ),
-        TOKEN( "fontwork-style",                  XML_FONTWORK_STYLE ),
-        TOKEN( "footer",                          XML_FOOTER ),
-        TOKEN( "footer-first",                    XML_FOOTER_FIRST ),
-        TOKEN( "footer-left",                     XML_FOOTER_LEFT ),
-        TOKEN( "footer-style",                    XML_FOOTER_STYLE ),
-        TOKEN( "footnote",                        XML_FOOTNOTE ),
-        TOKEN( "footnote-body",                   XML_FOOTNOTE_BODY ),
-        TOKEN( "footnote-citation",               XML_FOOTNOTE_CITATION ),
-        TOKEN( "footnote-continuation-notice-backward",       
XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ),
-        TOKEN( "footnote-continuation-notice-forward",        
XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD ),
-        TOKEN( "footnote-max-height",             XML_FOOTNOTE_MAX_HEIGHT ),
-        TOKEN( "footnote-ref",                    XML_FOOTNOTE_REF ),
-        TOKEN( "footnote-sep",                    XML_FOOTNOTE_SEP ),
-        TOKEN( "footnotes-configuration",         XML_FOOTNOTES_CONFIGURATION 
),
-        TOKEN( "footnotes-position",              XML_FOOTNOTES_POSITION ),
-        TOKEN( "forall",                          XML_FORALL ),
-        TOKEN( "force-manual",                    XML_FORCE_MANUAL ),
-        TOKEN( "foreground",                      XML_FOREGROUND ),
-        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 ),
-        TOKEN( "formulas",                        XML_FORMULAS ),
-        TOKEN( "fraction",                        XML_FRACTION ),
-        TOKEN( "frame",                           XML_FRAME ),
-        TOKEN( "frame-content",                   XML_FRAME_CONTENT ),
-        TOKEN( "frame-display-border",            XML_FRAME_DISPLAY_BORDER ),
-        TOKEN( "frame-display-scrollbar",         XML_FRAME_DISPLAY_SCROLLBAR 
),
-        TOKEN( "frame-end-margin",                XML_FRAME_END_MARGIN ),
-        TOKEN( "frame-margin-horizontal",         XML_FRAME_MARGIN_HORIZONTAL 
),
-        TOKEN( "frame-margin-vertical",           XML_FRAME_MARGIN_VERTICAL ),
-        TOKEN( "frame-name",                      XML_FRAME_NAME ),
-        TOKEN( "frame-start-margin",              XML_FRAME_START_MARGIN ),
-        TOKEN( "freeze",                          XML_FREEZE ),
-        TOKEN( "freeze-position",                 XML_FREEZE_POSITION ),
-        TOKEN( "from-another-table",              XML_FROM_ANOTHER_TABLE ),
-        TOKEN( "from-bottom",                     XML_FROM_BOTTOM ),
-        TOKEN( "from-center",                     XML_FROM_CENTER ),
-        TOKEN( "from-inside",                     XML_FROM_INSIDE ),
-        TOKEN( "from-left",                       XML_FROM_LEFT ),
-        TOKEN( "from-lower-left",                 XML_FROM_LOWER_LEFT ),
-        TOKEN( "from-lower-right",                XML_FROM_LOWER_RIGHT ),
-        TOKEN( "from-right",                      XML_FROM_RIGHT ),
-        TOKEN( "from-same-table",                 XML_FROM_SAME_TABLE ),
-        TOKEN( "from-top",                        XML_FROM_TOP ),
-        TOKEN( "from-upper-left",                 XML_FROM_UPPER_LEFT ),
-        TOKEN( "from-upper-right",                XML_FROM_UPPER_RIGHT ),
-        TOKEN( "fuchsia",                         XML_FUCHSIA ),
-        TOKEN( "full",                            XML_FULL ),
-        TOKEN( "full-screen",                     XML_FULL_SCREEN ),
-        TOKEN( "function",                        XML_FUNCTION ),
-        TOKEN( "fx",                              XML_FX ),
-        TOKEN( "fy",                              XML_FY ),
-        TOKEN( "g",                               XML_G ),
-        TOKEN( "gamma",                           XML_GAMMA ),
-        TOKEN( "gap",                             XML_GAP ),
-        TOKEN( "gap-width",                       XML_GAP_WIDTH ),
-        TOKEN( "gcd",                             XML_GCD ),
-        TOKEN( "generator",                       XML_GENERATOR ),
-        TOKEN( "geq",                             XML_GEQ ),
-        TOKEN( "gl3d-bar",                        XML_GL3DBAR ),
-        TOKEN( "gouraud",                         XML_GOURAUD ),
-        TOKEN( "gradient",                        XML_GRADIENT ),
-        TOKEN( "angle",                           XML_GRADIENT_ANGLE ),
-        TOKEN( "border",                          XML_GRADIENT_BORDER ),
-        TOKEN( "gradient-step-count",             XML_GRADIENT_STEP_COUNT ),
-        TOKEN( "gradient-style",                  XML_GRADIENT_STYLE ),
-        TOKEN( "axial",                           XML_GRADIENTSTYLE_AXIAL ),
-        TOKEN( "ellipsoid",                       XML_GRADIENTSTYLE_ELLIPSOID 
),
-        TOKEN( "linear",                          XML_GRADIENTSTYLE_LINEAR ),
-        TOKEN( "radial",                          XML_GRADIENTSTYLE_RADIAL ),
-        TOKEN( "rectangular",                     
XML_GRADIENTSTYLE_RECTANGULAR ),
-        TOKEN( "square",                          XML_GRADIENTSTYLE_SQUARE ),
-        TOKEN( "gradientTransform",               XML_GRADIENTTRANSFORM ),
-        TOKEN( "grand-total",                     XML_GRAND_TOTAL ),
-        TOKEN( "graphic",                         XML_GRAPHIC ),
-        TOKEN( "gray",                            XML_GRAY ),
-        TOKEN( "green",                           XML_GREEN ),
-        TOKEN( "greyscale",                       XML_GREYSCALE ),
-        TOKEN( "grid",                            XML_GRID ),
-        TOKEN( "groove",                          XML_GROOVE ),
-        TOKEN( "group-by-field-number",           XML_GROUP_BY_FIELD_NUMBER ),
-        TOKEN( "group-name",                      XML_GROUP_NAME ),
-        TOKEN( "grouping",                        XML_GROUPING ),
-        TOKEN( "gt",                              XML_GT ),
-        TOKEN( "guide-distance",                  XML_GUIDE_DISTANCE ),
-        TOKEN( "guide-overhang",                  XML_GUIDE_OVERHANG ),
-        TOKEN( "h",                               XML_H ),
-        TOKEN( "hanging",                         XML_HANGING ),
-        TOKEN( "has-persistent-data",             XML_HAS_PERSISTENT_DATA ),
-        TOKEN( "hatch",                           XML_HATCH ),
-        TOKEN( "distance",                        XML_HATCH_DISTANCE ),
-        TOKEN( "style",                           XML_HATCH_STYLE ),
-        TOKEN( "double",                          XML_HATCHSTYLE_DOUBLE ),
-        TOKEN( "single",                          XML_HATCHSTYLE_SINGLE ),
-        TOKEN( "triple",                          XML_HATCHSTYLE_TRIPLE ),
-        TOKEN( "header",                          XML_HEADER ),
-        TOKEN( "header-first",                    XML_HEADER_FIRST ),
-        TOKEN( "header-left",                     XML_HEADER_LEFT ),
-        TOKEN( "header-style",                    XML_HEADER_STYLE ),
-        TOKEN( "headers",                         XML_HEADERS ),
-        TOKEN( "height",                          XML_HEIGHT ),
-        TOKEN( "help",                            XML_HELP),
-        TOKEN( "help-file-name",                  XML_HELP_FILE_NAME ),
-        TOKEN( "help-id",                         XML_HELP_ID ),
-        TOKEN( "help-message",                    XML_HELP_MESSAGE ),
-        TOKEN( "hidden",                          XML_HIDDEN ),
-        TOKEN( "hidden-and-protected",            XML_HIDDEN_AND_PROTECTED ),
-        TOKEN( "hidden-paragraph",                XML_HIDDEN_PARAGRAPH ),
-        TOKEN( "hidden-text",                     XML_HIDDEN_TEXT ),
-        TOKEN( "hide",                            XML_HIDE ),
-        TOKEN( "hide-shape",                      XML_HIDE_SHAPE ),
-        TOKEN( "hide-text",                       XML_HIDE_TEXT ),
-        TOKEN( "highlighted-range",               XML_HIGHLIGHTED_RANGE ),
-        TOKEN( "hint",                            XML_HINT),
-        TOKEN( "horizontal",                      XML_HORIZONTAL ),
-        TOKEN( "horizontalstrike",                XML_HORIZONTALSTRIKE ),
-        TOKEN( "horizontal-lines",                XML_HORIZONTAL_LINES ),
+        TOKEN( "1",                               XML_1, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "10",                              XML_10, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "2",                               XML_2, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "3",                               XML_3, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "4",                               XML_4, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "5",                               XML_5, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "6",                               XML_6, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "7",                               XML_7, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "8",                               XML_8, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "9",                               XML_9, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "A",                               XML_A_UPCASE, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "I",                               XML_I_UPCASE, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM437",                          XML_IBM437, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM850",                          XML_IBM850, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM860",                          XML_IBM860, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM861",                          XML_IBM861, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM863",                          XML_IBM863, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "IBM865",                          XML_IBM865, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "ISO-8859-1",                      XML_ISO_8859_1, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "ole2",                            XML_OLE2, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( ":",                               XML__COLON, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "",                                XML__EMPTY, 
xmloff::XML_TOKEN_INVALID ),
+        TOKEN( "_unknown_",                       XML__UNKNOWN_, 
xmloff::XML_TOKEN_INVALID ),
+
+        TOKEN( "a",                               XML_A, xmloff::XML_a ),
+        TOKEN( "abbreviated-name",                XML_ABBREVIATED_NAME, 
xmloff::XML_abbreviated_name ),
+        TOKEN( "above",                           XML_ABOVE, xmloff::XML_above 
),
+        TOKEN( "abs",                             XML_ABS, xmloff::XML_abs ),
+        TOKEN( "accent",                          XML_ACCENT, 
xmloff::XML_accent ),
+        TOKEN( "accentunder",                     XML_ACCENTUNDER, 
xmloff::XML_accentunder ),
+        TOKEN( "acceptance-state",                XML_ACCEPTANCE_STATE, 
xmloff::XML_acceptance_state ),
+        TOKEN( "accepted",                        XML_ACCEPTED, 
xmloff::XML_accepted ),
+        TOKEN( "action",                          XML_ACTION, 
xmloff::XML_action ),
+        TOKEN( "active",                          XML_ACTIVE, 
xmloff::XML_active ),
+        TOKEN( "active-split-range",              XML_ACTIVE_SPLIT_RANGE, 
xmloff::XML_active_split_range ),
+        TOKEN( "active-table",                    XML_ACTIVE_TABLE, 
xmloff::XML_active_table ),
+        TOKEN( "actuate",                         XML_ACTUATE, 
xmloff::XML_actuate ),
+        TOKEN( "add-in",                          XML_ADD_IN, 
xmloff::XML_add_in ),
+        TOKEN( "add-in-name",                     XML_ADD_IN_NAME, 
xmloff::XML_add_in_name ),
+        TOKEN( "address",                         XML_ADDRESS, 
xmloff::XML_address ),
+        TOKEN( "adjustment",                      XML_ADJUSTMENT, 
xmloff::XML_adjustment ),
+        TOKEN( "algorithm",                       XML_ALGORITHM, 
xmloff::XML_algorithm ),
+        TOKEN( "align",                           XML_ALIGN, xmloff::XML_align 
),
+        TOKEN( "all",                             XML_ALL, xmloff::XML_all ),
+        TOKEN( "allow-empty-cell",                XML_ALLOW_EMPTY_CELL, 
xmloff::XML_allow_empty_cell ),
+        TOKEN( "alphabetical-index",              XML_ALPHABETICAL_INDEX, 
xmloff::XML_alphabetical_index ),
+        TOKEN( "alphabetical-index-auto-mark-file",       
XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, 
xmloff::XML_alphabetical_index_auto_mark_file ),
+        TOKEN( "alphabetical-index-entry-template",       
XML_ALPHABETICAL_INDEX_ENTRY_TEMPLATE, 
xmloff::XML_alphabetical_index_entry_template ),
+        TOKEN( "alphabetical-index-mark",         XML_ALPHABETICAL_INDEX_MARK, 
xmloff::XML_alphabetical_index_mark ),
+        TOKEN( "alphabetical-index-mark-end",     
XML_ALPHABETICAL_INDEX_MARK_END, xmloff::XML_alphabetical_index_mark_end ),
+        TOKEN( "alphabetical-index-mark-start",       
XML_ALPHABETICAL_INDEX_MARK_START, xmloff::XML_alphabetical_index_mark_start ),
+        TOKEN( "alphabetical-index-source",       
XML_ALPHABETICAL_INDEX_SOURCE, xmloff::XML_alphabetical_index_source ),
+        TOKEN( "alphabetical-separators",         XML_ALPHABETICAL_SEPARATORS, 
xmloff::XML_alphabetical_separators ),
+        TOKEN( "alternate",                       XML_ALTERNATE, 
xmloff::XML_alternate ),
+        TOKEN( "am-pm",                           XML_AM_PM, xmloff::XML_am_pm 
),
+        TOKEN( "ambient-color",                   XML_AMBIENT_COLOR, 
xmloff::XML_ambient_color ),
+        TOKEN( "anchor-page-number",              XML_ANCHOR_PAGE_NUMBER, 
xmloff::XML_anchor_page_number ),
+        TOKEN( "anchor-type",                     XML_ANCHOR_TYPE, 
xmloff::XML_anchor_type ),
+        TOKEN( "and",                             XML_AND, xmloff::XML_and ),
+        TOKEN( "animation",                       XML_ANIMATION, 
xmloff::XML_animation ),
+        TOKEN( "animation-delay",                 XML_ANIMATION_DELAY, 
xmloff::XML_animation_delay ),
+        TOKEN( "animation-direction",             XML_ANIMATION_DIRECTION, 
xmloff::XML_animation_direction ),
+        TOKEN( "animation-repeat",                XML_ANIMATION_REPEAT, 
xmloff::XML_animation_repeat ),
+        TOKEN( "animation-start-inside",          XML_ANIMATION_START_INSIDE, 
xmloff::XML_animation_start_inside ),

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to