[Libreoffice-commits] core.git: Branch 'feature/fastparser' - 3 commits - xmloff/source

Daniel Sikeler d.sikeler94 at gmail.com
Thu Feb 12 00:59:51 PST 2015


 xmloff/source/text/txtimp.cxx   |  817 ++++++++++++++++++++++++++--------------
 xmloff/source/text/txtparai.cxx |  227 +++++++++++
 xmloff/source/text/txtparai.hxx |   12 
 3 files changed, 783 insertions(+), 273 deletions(-)

New commits:
commit 970556a495a5edff8a3e1b73508be55b163b18b0
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Thu Feb 12 09:47:16 2015 +0100

    XMLParaContext implements fast interfaces
    
    all methods implemented
    
    Change-Id: Ib5a391cf2aa14f668c40b6a2caaf81cfb7751b7c

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 599ed1f..ea7eafb8 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2033,6 +2033,115 @@ XMLParaContext::XMLParaContext(
     }
 }
 
+XMLParaContext::XMLParaContext( SvXMLImport& rImport, sal_Int32 Element,
+    const Reference< xml::sax::XFastAttributeList >& xAttrList,
+    bool bHead )
+:   SvXMLImportContext( rImport ),
+    xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ),
+    m_bHaveAbout( false ),
+    nOutlineLevel( XML_H == (XML_H | Element) ? 1 : -1 ),
+    pHints( 0 ),
+    // Lost outline numbering in master document (#73509#)
+    mbOutlineLevelAttrFound( false ),
+    bIgnoreLeadingSpace( true ),
+    bHeading( bHead ),
+    bIsListHeader( false ),
+    bIsRestart( false ),
+    nStartValue( 0 ),
+    nStarFontsConvFlags( 0 )
+{
+    const SvXMLTokenMap& rTokenMap =
+        GetImport().GetTextImport()->GetTextPAttrTokenMap();
+
+    bool bHaveXmlId( false );
+    OUString aCondStyleName, sClassNames;
+
+    if( xAttrList.is() )
+    {
+        uno::Sequence< xml::FastAttribute > attributes = xAttrList->getFastAttributes();
+        for( xml::FastAttribute attribute : attributes )
+        {
+            switch( rTokenMap.Get( attribute.Token ) )
+            {
+            case XML_TOK_TEXT_P_XMLID:
+                m_sXmlId = attribute.Value;
+                bHaveXmlId = true;
+                break;
+            case XML_TOK_TEXT_P_ABOUT:
+                m_sAbout = attribute.Value;
+                m_bHaveAbout = true;
+                break;
+            case XML_TOK_TEXT_P_PROPERTY:
+                m_sProperty = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_CONTENT:
+                m_sContent = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_DATATYPE:
+                m_sDatatype = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_TEXTID:
+                if( !bHaveXmlId) { m_sXmlId = attribute.Value; }
+                break;
+            case XML_TOK_TEXT_P_STYLE_NAME:
+                sStyleName = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_CLASS_NAMES:
+                sClassNames = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_COND_STYLE_NAME:
+                aCondStyleName = attribute.Value;
+                break;
+            case XML_TOK_TEXT_P_LEVEL:
+                {
+                    sal_Int32 nTmp = attribute.Value.toInt32();
+                    if( nTmp > 0L )
+                    {
+                        if( nTmp > 127 )
+                            nTmp = 127;
+                        nOutlineLevel = static_cast< sal_Int8 >( nTmp );
+                    }
+                    // Lost outline numbering in master document (#i73509#)
+                    mbOutlineLevelAttrFound = true;
+                }
+                break;
+            case XML_TOK_TEXT_P_IS_LIST_HEADER:
+                {
+                    bool bBool(false);
+                    if( ::sax::Converter::convertBool( bBool, attribute.Value ) )
+                    {
+                        bIsListHeader = bBool;
+                    }
+                }
+                break;
+            case XML_TOK_TEXT_P_RESTART_NUMBERING:
+                {
+                    bool bBool(false);
+                    if( ::sax::Converter::convertBool( bBool, attribute.Value ) )
+                    {
+                        bIsRestart = bBool;
+                    }
+                }
+                break;
+            case XML_TOK_TEXT_P_START_VALUE:
+                {
+                    nStartValue = sal::static_int_cast< sal_Int16 >(
+                            attribute.Value.toInt32() );
+                }
+                break;
+            }
+        }
+    }
+
+    if( !aCondStyleName.isEmpty() )
+        sStyleName = aCondStyleName;
+    else if( !sClassNames.isEmpty() )
+    {
+        sal_Int32 nDummy = 0;
+        sStyleName = sClassNames.getToken( 0, ' ', nDummy );
+    }
+}
+
 XMLParaContext::~XMLParaContext()
 {
     rtl::Reference < XMLTextImportHelper > xTxtImport(
@@ -2330,6 +2439,21 @@ SvXMLImportContext *XMLParaContext::CreateChildContext(
                                                      );
 }
 
+Reference< xml::sax::XFastContextHandler > SAL_CALL
+    XMLParaContext::createFastChildContext( sal_Int32 Element,
+    const Reference< xml::sax::XFastAttributeList >& xAttrList )
+    throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+    const SvXMLTokenMap& rTokenMap =
+        GetImport().GetTextImport()->GetTextPElemTokenMap();
+    sal_uInt16 nToken = rTokenMap.Get( Element );
+    if( !pHints )
+        pHints = new XMLHints_Impl;
+    return XMLImpSpanContext_Impl::createFastChildContext(
+            GetImport(), Element, xAttrList, nToken, *pHints,
+            bIgnoreLeadingSpace, nStarFontsConvFlags );
+}
+
 void XMLParaContext::Characters( const OUString& rChars )
 {
     OUString sChars =
@@ -2339,6 +2463,15 @@ void XMLParaContext::Characters( const OUString& rChars )
     GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
 }
 
+void SAL_CALL XMLParaContext::characters( const OUString& rChars )
+    throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+    OUString sChars =
+        GetImport().GetTextImport()->ConvertStarFonts( rChars,
+                sStyleName, nStarFontsConvFlags, true, GetImport() );
+    GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
+}
+
 TYPEINIT1( XMLNumberedParaContext, SvXMLImportContext );
 
 XMLNumberedParaContext::XMLNumberedParaContext(
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index f8d11cb..a273b51 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -26,7 +26,8 @@
 class XMLHints_Impl;
 namespace com { namespace sun { namespace star {
 namespace text {  class XTextRange; }
-namespace xml { namespace sax { class XAttributeList; } }
+namespace xml { namespace sax { class XAttributeList;
+                                class XFastAttributeList; } }
 } } }
 
 #define CONV_FROM_STAR_BATS 1
@@ -65,6 +66,9 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList > & xAttrList,
             bool bHeading );
+    XMLParaContext( SvXMLImport& rImport, sal_Int32 Element,
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList,
+        bool bHeading );
 
     virtual ~XMLParaContext();
 
@@ -72,8 +76,14 @@ public:
             const OUString& rLocalName,
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+    virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+        createFastChildContext( sal_Int32 Element,
+        const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
+        throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
     virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+    virtual void SAL_CALL characters( const OUString& rChars )
+        throw(css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
 };
 
commit 973e8f43d55658e4826b52204bbc8215d8d42457
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Thu Feb 12 09:30:13 2015 +0100

    XMLimpSpanContext_Impl implements fast interface
    
    only one method is missing (createFastChildContext),
    due to too many dependencies
    
    Change-Id: Id6f5ddbaaf2a29f2ba714a031236839bd828ad68

diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 7676d74..599ed1f 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -51,6 +51,9 @@
 #include <xmloff/XMLEventsImportContext.hxx>
 #include "XMLChangeImportContext.hxx"
 #include "txtlists.hxx"
+#include <com/sun/star/xml/FastAttribute.hpp>
+#include <com/sun/star/xml/sax/FastToken.hpp>
+#include <xmloff/token/tokens.hxx>
 
 #include <txtparaimphint.hxx>
 class XMLHints_Impl : public boost::ptr_vector<XMLHint_Impl> {};
@@ -63,6 +66,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::xmloff::token;
 using ::com::sun::star::container::XEnumerationAccess;
 using ::com::sun::star::container::XEnumeration;
+using namespace xmloff;
+using css::xml::sax::FastToken::NAMESPACE;
 
 TYPEINIT1( XMLCharContext, SvXMLImportContext );
 
@@ -291,6 +296,10 @@ public:
             bool& rIgnLeadSpace,
             sal_uInt8 nSFConvFlags
                           );
+    XMLImpSpanContext_Impl( SvXMLImport& rImport, sal_Int32 Element,
+        const Reference< xml::sax::XFastAttributeList >& xAttrList,
+        XMLHints_Impl& rHnts, bool& rIgnLeadSpace,
+        sal_uInt8 nSFConvFlags );
 
     virtual ~XMLImpSpanContext_Impl();
 
@@ -302,11 +311,22 @@ public:
             bool& rIgnLeadSpace,
             sal_uInt8 nStarFontsConvFlags = 0
              );
+    static Reference< xml::sax::XFastContextHandler > createFastChildContext(
+        SvXMLImport& rImport, sal_Int32 Element,
+        const Reference< xml::sax::XFastAttributeList >& xAttrList,
+        sal_uInt16 nToken, XMLHints_Impl& rHnts,
+        bool& rIgnLeadSpace, sal_uInt8 nStarFontsConvFlags = 0 );
     virtual SvXMLImportContext *CreateChildContext(
             sal_uInt16 nPrefix, const OUString& rLocalName,
             const Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
+    virtual Reference< xml::sax::XFastContextHandler > SAL_CALL
+        createFastChildContext( sal_Int32 Element,
+        const Reference< xml::sax::XFastAttributeList >& xAttrList )
+        throw(RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 
     virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;
+    virtual void SAL_CALL characters( const OUString& rChars )
+        throw(RuntimeException, xml::sax::SAXException, std::exception) SAL_OVERRIDE;
 };
 
 class XMLImpHyperlinkContext_Impl : public SvXMLImportContext
@@ -1547,6 +1567,34 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
     }
 }
 
+XMLImpSpanContext_Impl::XMLImpSpanContext_Impl( SvXMLImport& rImport,
+    sal_Int32 Element,
+    const Reference< xml::sax::XFastAttributeList >& xAttrList,
+    XMLHints_Impl& rHnts, bool& rIgnLeadSpace,
+    sal_uInt8 nSFConvFlags )
+:   SvXMLImportContext( rImport ),
+    rHints( rHnts ),
+    pHint( 0 ),
+    rIgnoreLeadingSpace( rIgnLeadSpace ),
+    nStarFontsConvFlags( nSFConvFlags & (CONV_FROM_STAR_BATS|CONV_FROM_STAR_MATH) )
+{
+    OUString aStyleName;
+
+    if( xAttrList.is() &&
+        Element == (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name)
+        && xAttrList->hasAttribute( Element ) )
+    {
+        aStyleName = xAttrList->getValue( Element );
+    }
+
+    if( !aStyleName.isEmpty() )
+    {
+        pHint = new XMLStyleHint_Impl( aStyleName,
+            GetImport().GetTextImport()->GetCursorAsRange()->getStart() );
+        rHints.push_back( pHint );
+    }
+}
+
 XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl()
 {
     if( pHint )
@@ -1795,6 +1843,27 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
     return pContext;
 }
 
+Reference< xml::sax::XFastContextHandler >
+    XMLImpSpanContext_Impl::createFastChildContext( SvXMLImport& rImport,
+    sal_Int32 Element,
+    const Reference< xml::sax::XFastAttributeList >& xAttrList,
+    sal_uInt16 nToken, XMLHints_Impl& rHints,
+    bool& rIgnoreLeadingSpace, sal_uInt8 nStarFontsConvFlags )
+{
+    Reference< xml::sax::XFastContextHandler > pContext = 0;
+
+    switch( nToken )
+    {
+    case XML_TOK_TEXT_SPAN:
+        pContext = new XMLImpSpanContext_Impl( rImport, Element, xAttrList,
+                rHints, rIgnoreLeadingSpace, nStarFontsConvFlags );
+        break;
+    //TODO: missing cases
+    }
+
+    return pContext;
+}
+
 SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
         sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
@@ -1809,6 +1878,19 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
                              );
 }
 
+Reference< xml::sax::XFastContextHandler > SAL_CALL
+    XMLImpSpanContext_Impl::createFastChildContext( sal_Int32 Element,
+    const Reference< xml::sax::XFastAttributeList >& xAttrList )
+    throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+    const SvXMLTokenMap& rTokenMap =
+        GetImport().GetTextImport()->GetTextPElemTokenMap();
+    sal_uInt16 nToken = rTokenMap.Get( Element );
+
+    return createFastChildContext( GetImport(), Element, xAttrList,
+            nToken, rHints, rIgnoreLeadingSpace, nStarFontsConvFlags );
+}
+
 void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
 {
     OUString sStyleName;
@@ -1821,6 +1903,18 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
     GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
 }
 
+void XMLImpSpanContext_Impl::characters( const OUString& rChars )
+    throw(RuntimeException, xml::sax::SAXException, std::exception)
+{
+    OUString sStyleName;
+    if( pHint )
+        sStyleName = pHint->GetStyleName();
+    OUString sChars =
+        GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
+                nStarFontsConvFlags, false, GetImport() );
+    GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
+}
+
 TYPEINIT1( XMLParaContext, SvXMLImportContext );
 
 XMLParaContext::XMLParaContext(
commit 0c3497dcd6f8c8f69ea7d55d28a08cc25abf66d4
Author: Daniel Sikeler <d.sikeler94 at gmail.com>
Date:   Wed Feb 11 15:56:31 2015 +0100

    SvXMLTokenMapEntries in xmloff/source/text/
    
    Change-Id: I119b31c154135f80cfc52a3bf8f00a33dd324524

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index a7e781b..edecd75 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -35,6 +35,8 @@
 #include <xmloff/txtstyli.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmloff/maptype.hxx>
+#include <xmloff/token/tokens.hxx>
+#include <com/sun/star/xml/sax/FastToken.hpp>
 
 #include "txtparai.hxx"
 #include <xmloff/txtprmap.hxx>
@@ -76,215 +78,363 @@ using namespace ::com::sun::star::xml::sax;
 using namespace ::com::sun::star::lang;
 using namespace ::xmloff::token;
 using namespace ::com::sun::star::ucb;
+using namespace xmloff;
+using css::xml::sax::FastToken::NAMESPACE;
 
 static const SvXMLTokenMapEntry aTextElemTokenMap[] =
 {
-    { XML_NAMESPACE_TEXT, XML_P,                XML_TOK_TEXT_P              },
-    { XML_NAMESPACE_TEXT, XML_H,                XML_TOK_TEXT_H              },
-    { XML_NAMESPACE_TEXT, XML_LIST,             XML_TOK_TEXT_LIST           },
-    { XML_NAMESPACE_DRAW, XML_FRAME,            XML_TOK_TEXT_FRAME_PAGE     },
-    { XML_NAMESPACE_DRAW, XML_A,                XML_TOK_DRAW_A_PAGE },
-    { XML_NAMESPACE_TABLE,XML_TABLE,            XML_TOK_TABLE_TABLE         },
-    { XML_NAMESPACE_LO_EXT,XML_TABLE,           XML_TOK_TABLE_TABLE         },
-    { XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS,   XML_TOK_TEXT_VARFIELD_DECLS },
-    { XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, XML_TOK_TEXT_USERFIELD_DECLS },
-    { XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS,   XML_TOK_TEXT_SEQUENCE_DECLS },
-    { XML_NAMESPACE_TEXT, XML_DDE_CONNECTION_DECLS, XML_TOK_TEXT_DDE_DECLS },
-    { XML_NAMESPACE_TEXT, XML_SECTION,          XML_TOK_TEXT_SECTION },
-    { XML_NAMESPACE_TEXT, XML_TABLE_OF_CONTENT, XML_TOK_TEXT_TOC },
-    { XML_NAMESPACE_TEXT, XML_OBJECT_INDEX,     XML_TOK_TEXT_OBJECT_INDEX },
-    { XML_NAMESPACE_TEXT, XML_TABLE_INDEX,      XML_TOK_TEXT_TABLE_INDEX },
-    { XML_NAMESPACE_TEXT, XML_ILLUSTRATION_INDEX, XML_TOK_TEXT_ILLUSTRATION_INDEX },
-    { XML_NAMESPACE_TEXT, XML_USER_INDEX,       XML_TOK_TEXT_USER_INDEX },
-    { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX, XML_TOK_TEXT_ALPHABETICAL_INDEX },
-    { XML_NAMESPACE_TEXT, XML_BIBLIOGRAPHY,     XML_TOK_TEXT_BIBLIOGRAPHY_INDEX },
-    { XML_NAMESPACE_TEXT, XML_INDEX_TITLE,      XML_TOK_TEXT_INDEX_TITLE },
-    { XML_NAMESPACE_TEXT, XML_TRACKED_CHANGES,  XML_TOK_TEXT_TRACKED_CHANGES },
-    { XML_NAMESPACE_TEXT, XML_CHANGE_START,     XML_TOK_TEXT_CHANGE_START },
-    { XML_NAMESPACE_TEXT, XML_CHANGE_END,       XML_TOK_TEXT_CHANGE_END },
-    { XML_NAMESPACE_TEXT, XML_CHANGE,           XML_TOK_TEXT_CHANGE },
-    { XML_NAMESPACE_OFFICE, XML_FORMS,          XML_TOK_TEXT_FORMS },
-    { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS,    XML_TOK_TEXT_CALCULATION_SETTINGS },
-    { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, XML_TOK_TEXT_AUTOMARK },
+    { XML_NAMESPACE_TEXT, XML_P,                XML_TOK_TEXT_P,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_P) },
+    { XML_NAMESPACE_TEXT, XML_H,                XML_TOK_TEXT_H,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_H) },
+    { XML_NAMESPACE_TEXT, XML_LIST,             XML_TOK_TEXT_LIST,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_list) },
+    { XML_NAMESPACE_DRAW, XML_FRAME,            XML_TOK_TEXT_FRAME_PAGE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_frame) },
+    { XML_NAMESPACE_DRAW, XML_A,                XML_TOK_DRAW_A_PAGE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_a) },
+    { XML_NAMESPACE_TABLE,XML_TABLE,            XML_TOK_TABLE_TABLE,
+        (NAMESPACE | XML_NAMESPACE_TABLE | XML_table) },
+    { XML_NAMESPACE_LO_EXT,XML_TABLE,           XML_TOK_TABLE_TABLE,
+        (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_table) },
+    { XML_NAMESPACE_TEXT, XML_VARIABLE_DECLS,   XML_TOK_TEXT_VARFIELD_DECLS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_variable_decls) },
+    { XML_NAMESPACE_TEXT, XML_USER_FIELD_DECLS, XML_TOK_TEXT_USERFIELD_DECLS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_field_decls) },
+    { XML_NAMESPACE_TEXT, XML_SEQUENCE_DECLS,   XML_TOK_TEXT_SEQUENCE_DECLS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sequence_decls) },
+    { XML_NAMESPACE_TEXT, XML_DDE_CONNECTION_DECLS, XML_TOK_TEXT_DDE_DECLS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_dde_connection_decls) },
+    { XML_NAMESPACE_TEXT, XML_SECTION,          XML_TOK_TEXT_SECTION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_section) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_OF_CONTENT, XML_TOK_TEXT_TOC,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_of_content) },
+    { XML_NAMESPACE_TEXT, XML_OBJECT_INDEX,     XML_TOK_TEXT_OBJECT_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_object_index) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_INDEX,      XML_TOK_TEXT_TABLE_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_index) },
+    { XML_NAMESPACE_TEXT, XML_ILLUSTRATION_INDEX, XML_TOK_TEXT_ILLUSTRATION_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_illustration_index) },
+    { XML_NAMESPACE_TEXT, XML_USER_INDEX,       XML_TOK_TEXT_USER_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index) },
+    { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX, XML_TOK_TEXT_ALPHABETICAL_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index) },
+    { XML_NAMESPACE_TEXT, XML_BIBLIOGRAPHY,     XML_TOK_TEXT_BIBLIOGRAPHY_INDEX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bibliography) },
+    { XML_NAMESPACE_TEXT, XML_INDEX_TITLE,      XML_TOK_TEXT_INDEX_TITLE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_index_title) },
+    { XML_NAMESPACE_TEXT, XML_TRACKED_CHANGES,  XML_TOK_TEXT_TRACKED_CHANGES,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_tracked_changes) },
+    { XML_NAMESPACE_TEXT, XML_CHANGE_START,     XML_TOK_TEXT_CHANGE_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change_start) },
+    { XML_NAMESPACE_TEXT, XML_CHANGE_END,       XML_TOK_TEXT_CHANGE_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change_end) },
+    { XML_NAMESPACE_TEXT, XML_CHANGE,           XML_TOK_TEXT_CHANGE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change) },
+    { XML_NAMESPACE_OFFICE, XML_FORMS,          XML_TOK_TEXT_FORMS,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_forms) },
+    { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS,    XML_TOK_TEXT_CALCULATION_SETTINGS,
+        (NAMESPACE | XML_NAMESPACE_TABLE | XML_calculation_settings) },
+    { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, XML_TOK_TEXT_AUTOMARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index_auto_mark_file) },
     // #i52127#
-    { XML_NAMESPACE_TEXT, XML_NUMBERED_PARAGRAPH, XML_TOK_TEXT_NUMBERED_PARAGRAPH   },
+    { XML_NAMESPACE_TEXT, XML_NUMBERED_PARAGRAPH, XML_TOK_TEXT_NUMBERED_PARAGRAPH,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_numbered_paragraph) },
 
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
 {
-    { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN },
-    { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP },
-    { XML_NAMESPACE_TEXT, XML_LINE_BREAK, XML_TOK_TEXT_LINE_BREAK },
-    { XML_NAMESPACE_TEXT, XML_SOFT_PAGE_BREAK, XML_TOK_TEXT_SOFT_PAGE_BREAK },
-    { XML_NAMESPACE_TEXT, XML_S, XML_TOK_TEXT_S },
-    { XML_NAMESPACE_TEXT, XML_A, XML_TOK_TEXT_HYPERLINK },
-    { XML_NAMESPACE_TEXT, XML_RUBY, XML_TOK_TEXT_RUBY },
-
-    { XML_NAMESPACE_TEXT, XML_NOTE, XML_TOK_TEXT_NOTE },
-    { XML_NAMESPACE_TEXT, XML_BOOKMARK, XML_TOK_TEXT_BOOKMARK },
-    { XML_NAMESPACE_TEXT, XML_BOOKMARK_START, XML_TOK_TEXT_BOOKMARK_START },
-    { XML_NAMESPACE_TEXT, XML_BOOKMARK_END, XML_TOK_TEXT_BOOKMARK_END },
-    { XML_NAMESPACE_TEXT, XML_REFERENCE_MARK, XML_TOK_TEXT_REFERENCE },
+    { XML_NAMESPACE_TEXT, XML_SPAN, XML_TOK_TEXT_SPAN,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_span) },
+    { XML_NAMESPACE_TEXT, XML_TAB, XML_TOK_TEXT_TAB_STOP,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_tab) },
+    { XML_NAMESPACE_TEXT, XML_LINE_BREAK, XML_TOK_TEXT_LINE_BREAK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_line_break) },
+    { XML_NAMESPACE_TEXT, XML_SOFT_PAGE_BREAK, XML_TOK_TEXT_SOFT_PAGE_BREAK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_soft_page_break) },
+    { XML_NAMESPACE_TEXT, XML_S, XML_TOK_TEXT_S,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_s) },
+    { XML_NAMESPACE_TEXT, XML_A, XML_TOK_TEXT_HYPERLINK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_a) },
+    { XML_NAMESPACE_TEXT, XML_RUBY, XML_TOK_TEXT_RUBY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_ruby) },
+
+    { XML_NAMESPACE_TEXT, XML_NOTE, XML_TOK_TEXT_NOTE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_note) },
+    { XML_NAMESPACE_TEXT, XML_BOOKMARK, XML_TOK_TEXT_BOOKMARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bookmark) },
+    { XML_NAMESPACE_TEXT, XML_BOOKMARK_START, XML_TOK_TEXT_BOOKMARK_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bookmark_start) },
+    { XML_NAMESPACE_TEXT, XML_BOOKMARK_END, XML_TOK_TEXT_BOOKMARK_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bookmark_end) },
+    { XML_NAMESPACE_TEXT, XML_REFERENCE_MARK, XML_TOK_TEXT_REFERENCE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_reference_mark) },
     { XML_NAMESPACE_TEXT, XML_REFERENCE_MARK_START,
-      XML_TOK_TEXT_REFERENCE_START },
+      XML_TOK_TEXT_REFERENCE_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_reference_mark_start) },
     { XML_NAMESPACE_TEXT, XML_REFERENCE_MARK_END,
-      XML_TOK_TEXT_REFERENCE_END },
+      XML_TOK_TEXT_REFERENCE_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_reference_mark_end) },
 
-    { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_TEXT_FRAME },
-    { XML_NAMESPACE_DRAW, XML_A,                XML_TOK_DRAW_A },
+    { XML_NAMESPACE_DRAW, XML_FRAME, XML_TOK_TEXT_FRAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_frame) },
+    { XML_NAMESPACE_DRAW, XML_A,                XML_TOK_DRAW_A,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_a) },
 
     // index marks
-    { XML_NAMESPACE_TEXT, XML_TOC_MARK, XML_TOK_TEXT_TOC_MARK },
-    { XML_NAMESPACE_TEXT, XML_TOC_MARK_START, XML_TOK_TEXT_TOC_MARK_START },
-    { XML_NAMESPACE_TEXT, XML_TOC_MARK_END, XML_TOK_TEXT_TOC_MARK_END },
-    { XML_NAMESPACE_TEXT, XML_USER_INDEX_MARK, XML_TOK_TEXT_USER_INDEX_MARK },
+    { XML_NAMESPACE_TEXT, XML_TOC_MARK, XML_TOK_TEXT_TOC_MARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_toc_mark) },
+    { XML_NAMESPACE_TEXT, XML_TOC_MARK_START, XML_TOK_TEXT_TOC_MARK_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_toc_mark_start) },
+    { XML_NAMESPACE_TEXT, XML_TOC_MARK_END, XML_TOK_TEXT_TOC_MARK_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_toc_mark_end) },
+    { XML_NAMESPACE_TEXT, XML_USER_INDEX_MARK, XML_TOK_TEXT_USER_INDEX_MARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index_mark) },
     { XML_NAMESPACE_TEXT, XML_USER_INDEX_MARK_START,
-      XML_TOK_TEXT_USER_INDEX_MARK_START },
+      XML_TOK_TEXT_USER_INDEX_MARK_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index_mark_start) },
     { XML_NAMESPACE_TEXT, XML_USER_INDEX_MARK_END,
-      XML_TOK_TEXT_USER_INDEX_MARK_END },
+      XML_TOK_TEXT_USER_INDEX_MARK_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_index_mark_end) },
     { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_MARK,
-      XML_TOK_TEXT_ALPHA_INDEX_MARK },
+      XML_TOK_TEXT_ALPHA_INDEX_MARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index_mark) },
     { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_MARK_START,
-      XML_TOK_TEXT_ALPHA_INDEX_MARK_START },
+      XML_TOK_TEXT_ALPHA_INDEX_MARK_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index_mark_start) },
     { XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_MARK_END,
-      XML_TOK_TEXT_ALPHA_INDEX_MARK_END },
+      XML_TOK_TEXT_ALPHA_INDEX_MARK_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_alphabetical_index_mark_end) },
 
     // sender fields
-    { XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME},
-    { XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME },
-    { XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
-    { XML_NAMESPACE_TEXT,   XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
-    { XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE },
-    { XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION },
-    { XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL },
+    { XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_firstname) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_lastname) },
+    { XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS,
+        (NAMESPACE | XML_NAMESPACE_LO_EXT | XML_sender_initials) },
+    { XML_NAMESPACE_TEXT,   XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_initials) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_title) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_position) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_email) },
     { XML_NAMESPACE_TEXT, XML_SENDER_PHONE_PRIVATE,
-      XML_TOK_TEXT_SENDER_PHONE_PRIVATE },
-    { XML_NAMESPACE_TEXT, XML_SENDER_FAX, XML_TOK_TEXT_SENDER_FAX },
-    { XML_NAMESPACE_TEXT, XML_SENDER_COMPANY, XML_TOK_TEXT_SENDER_COMPANY },
+      XML_TOK_TEXT_SENDER_PHONE_PRIVATE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_phone_private) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_FAX, XML_TOK_TEXT_SENDER_FAX,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_fax) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_COMPANY, XML_TOK_TEXT_SENDER_COMPANY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_company) },
     { XML_NAMESPACE_TEXT, XML_SENDER_PHONE_WORK,
-      XML_TOK_TEXT_SENDER_PHONE_WORK },
-    { XML_NAMESPACE_TEXT, XML_SENDER_STREET, XML_TOK_TEXT_SENDER_STREET },
-    { XML_NAMESPACE_TEXT, XML_SENDER_CITY, XML_TOK_TEXT_SENDER_CITY },
+      XML_TOK_TEXT_SENDER_PHONE_WORK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_phone_work) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_STREET, XML_TOK_TEXT_SENDER_STREET,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_street) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_CITY, XML_TOK_TEXT_SENDER_CITY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_city) },
     { XML_NAMESPACE_TEXT, XML_SENDER_POSTAL_CODE,
-      XML_TOK_TEXT_SENDER_POSTAL_CODE },
-    { XML_NAMESPACE_TEXT, XML_SENDER_COUNTRY, XML_TOK_TEXT_SENDER_COUNTRY },
+      XML_TOK_TEXT_SENDER_POSTAL_CODE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_postal_code) },
+    { XML_NAMESPACE_TEXT, XML_SENDER_COUNTRY, XML_TOK_TEXT_SENDER_COUNTRY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_country) },
     { XML_NAMESPACE_TEXT, XML_SENDER_STATE_OR_PROVINCE,
-      XML_TOK_TEXT_SENDER_STATE_OR_PROVINCE },
+      XML_TOK_TEXT_SENDER_STATE_OR_PROVINCE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sender_state_or_province) },
 
     // misc. document fields
-    { XML_NAMESPACE_TEXT, XML_AUTHOR_NAME, XML_TOK_TEXT_AUTHOR_NAME },
-    { XML_NAMESPACE_TEXT, XML_AUTHOR_INITIALS, XML_TOK_TEXT_AUTHOR_INITIALS },
-    { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_TEXT_DATE },
-    { XML_NAMESPACE_TEXT, XML_TIME, XML_TOK_TEXT_TIME },
-    { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, XML_TOK_TEXT_PAGE_NUMBER },
+    { XML_NAMESPACE_TEXT, XML_AUTHOR_NAME, XML_TOK_TEXT_AUTHOR_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_author_name) },
+    { XML_NAMESPACE_TEXT, XML_AUTHOR_INITIALS, XML_TOK_TEXT_AUTHOR_INITIALS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_author_initials) },
+    { XML_NAMESPACE_TEXT, XML_DATE, XML_TOK_TEXT_DATE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_date) },
+    { XML_NAMESPACE_TEXT, XML_TIME, XML_TOK_TEXT_TIME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_time) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_NUMBER, XML_TOK_TEXT_PAGE_NUMBER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_number) },
     { XML_NAMESPACE_TEXT, XML_PAGE_CONTINUATION_STRING,
-      XML_TOK_TEXT_PAGE_CONTINUATION_STRING },
+      XML_TOK_TEXT_PAGE_CONTINUATION_STRING,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_continuation_string) },
 
     // variable fields
-    { XML_NAMESPACE_TEXT, XML_VARIABLE_SET, XML_TOK_TEXT_VARIABLE_SET },
-    { XML_NAMESPACE_TEXT, XML_VARIABLE_GET, XML_TOK_TEXT_VARIABLE_GET },
-    { XML_NAMESPACE_TEXT, XML_VARIABLE_INPUT, XML_TOK_TEXT_VARIABLE_INPUT },
-    { XML_NAMESPACE_TEXT, XML_USER_FIELD_GET, XML_TOK_TEXT_USER_FIELD_GET },
-    { XML_NAMESPACE_TEXT, XML_USER_FIELD_INPUT,XML_TOK_TEXT_USER_FIELD_INPUT},
-    { XML_NAMESPACE_TEXT, XML_SEQUENCE, XML_TOK_TEXT_SEQUENCE },
-    { XML_NAMESPACE_TEXT, XML_EXPRESSION, XML_TOK_TEXT_EXPRESSION },
-    { XML_NAMESPACE_TEXT, XML_TEXT_INPUT, XML_TOK_TEXT_TEXT_INPUT },
+    { XML_NAMESPACE_TEXT, XML_VARIABLE_SET, XML_TOK_TEXT_VARIABLE_SET,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_variable_set) },
+    { XML_NAMESPACE_TEXT, XML_VARIABLE_GET, XML_TOK_TEXT_VARIABLE_GET,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_variable_get) },
+    { XML_NAMESPACE_TEXT, XML_VARIABLE_INPUT, XML_TOK_TEXT_VARIABLE_INPUT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_variable_input) },
+    { XML_NAMESPACE_TEXT, XML_USER_FIELD_GET, XML_TOK_TEXT_USER_FIELD_GET,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_field_get) },
+    { XML_NAMESPACE_TEXT, XML_USER_FIELD_INPUT,XML_TOK_TEXT_USER_FIELD_INPUT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_field_input) },
+    { XML_NAMESPACE_TEXT, XML_SEQUENCE, XML_TOK_TEXT_SEQUENCE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sequence) },
+    { XML_NAMESPACE_TEXT, XML_EXPRESSION, XML_TOK_TEXT_EXPRESSION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_expression) },
+    { XML_NAMESPACE_TEXT, XML_TEXT_INPUT, XML_TOK_TEXT_TEXT_INPUT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_text_input) },
 
     // database fields
     { XML_NAMESPACE_TEXT, XML_DATABASE_DISPLAY,
-      XML_TOK_TEXT_DATABASE_DISPLAY },
+      XML_TOK_TEXT_DATABASE_DISPLAY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_display) },
     { XML_NAMESPACE_TEXT, XML_DATABASE_NEXT,
-      XML_TOK_TEXT_DATABASE_NEXT },
+      XML_TOK_TEXT_DATABASE_NEXT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_next) },
     { XML_NAMESPACE_TEXT, XML_DATABASE_ROW_SELECT,
-      XML_TOK_TEXT_DATABASE_SELECT },
+      XML_TOK_TEXT_DATABASE_SELECT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_row_select) },
     { XML_NAMESPACE_TEXT, XML_DATABASE_ROW_NUMBER,
-      XML_TOK_TEXT_DATABASE_ROW_NUMBER },
-    { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXT_DATABASE_NAME },
+      XML_TOK_TEXT_DATABASE_ROW_NUMBER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_row_number) },
+    { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXT_DATABASE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_name) },
 
     // docinfo fields
     { XML_NAMESPACE_TEXT, XML_INITIAL_CREATOR,
-      XML_TOK_TEXT_DOCUMENT_CREATION_AUTHOR },
-    { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXT_DOCUMENT_DESCRIPTION},
-    { XML_NAMESPACE_TEXT, XML_PRINTED_BY, XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR},
-    { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_TEXT_DOCUMENT_TITLE },
-    { XML_NAMESPACE_TEXT, XML_SUBJECT, XML_TOK_TEXT_DOCUMENT_SUBJECT },
-    { XML_NAMESPACE_TEXT, XML_KEYWORDS, XML_TOK_TEXT_DOCUMENT_KEYWORDS },
-    { XML_NAMESPACE_TEXT, XML_CREATOR, XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR },
+      XML_TOK_TEXT_DOCUMENT_CREATION_AUTHOR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_initial_creator) },
+    { XML_NAMESPACE_TEXT, XML_DESCRIPTION, XML_TOK_TEXT_DOCUMENT_DESCRIPTION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_description) },
+    { XML_NAMESPACE_TEXT, XML_PRINTED_BY, XML_TOK_TEXT_DOCUMENT_PRINT_AUTHOR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_printed_by) },
+    { XML_NAMESPACE_TEXT, XML_TITLE, XML_TOK_TEXT_DOCUMENT_TITLE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_title) },
+    { XML_NAMESPACE_TEXT, XML_SUBJECT, XML_TOK_TEXT_DOCUMENT_SUBJECT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_subject) },
+    { XML_NAMESPACE_TEXT, XML_KEYWORDS, XML_TOK_TEXT_DOCUMENT_KEYWORDS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_keywords) },
+    { XML_NAMESPACE_TEXT, XML_CREATOR, XML_TOK_TEXT_DOCUMENT_SAVE_AUTHOR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_creator) },
     { XML_NAMESPACE_TEXT, XML_EDITING_CYCLES,
-      XML_TOK_TEXT_DOCUMENT_REVISION },
+      XML_TOK_TEXT_DOCUMENT_REVISION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_editing_cycles) },
     { XML_NAMESPACE_TEXT, XML_CREATION_DATE,
-      XML_TOK_TEXT_DOCUMENT_CREATION_DATE },
+      XML_TOK_TEXT_DOCUMENT_CREATION_DATE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_creation_date) },
     { XML_NAMESPACE_TEXT, XML_CREATION_TIME,
-      XML_TOK_TEXT_DOCUMENT_CREATION_TIME },
-    { XML_NAMESPACE_TEXT, XML_PRINT_DATE, XML_TOK_TEXT_DOCUMENT_PRINT_DATE },
-    { XML_NAMESPACE_TEXT, XML_PRINT_TIME, XML_TOK_TEXT_DOCUMENT_PRINT_TIME },
+      XML_TOK_TEXT_DOCUMENT_CREATION_TIME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_creation_time) },
+    { XML_NAMESPACE_TEXT, XML_PRINT_DATE, XML_TOK_TEXT_DOCUMENT_PRINT_DATE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_print_date) },
+    { XML_NAMESPACE_TEXT, XML_PRINT_TIME, XML_TOK_TEXT_DOCUMENT_PRINT_TIME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_print_time) },
     { XML_NAMESPACE_TEXT, XML_MODIFICATION_DATE,
-      XML_TOK_TEXT_DOCUMENT_SAVE_DATE },
+      XML_TOK_TEXT_DOCUMENT_SAVE_DATE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_modification_date) },
     { XML_NAMESPACE_TEXT, XML_MODIFICATION_TIME,
-      XML_TOK_TEXT_DOCUMENT_SAVE_TIME },
+      XML_TOK_TEXT_DOCUMENT_SAVE_TIME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_modification_time) },
     { XML_NAMESPACE_TEXT, XML_EDITING_DURATION,
-      XML_TOK_TEXT_DOCUMENT_EDIT_DURATION },
+      XML_TOK_TEXT_DOCUMENT_EDIT_DURATION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_editing_duration) },
     { XML_NAMESPACE_TEXT, XML_USER_DEFINED,
-      XML_TOK_TEXT_DOCUMENT_USER_DEFINED },
+      XML_TOK_TEXT_DOCUMENT_USER_DEFINED,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_user_defined) },
 
     // misc fields
-    { XML_NAMESPACE_TEXT, XML_PLACEHOLDER, XML_TOK_TEXT_PLACEHOLDER },
-    { XML_NAMESPACE_TEXT, XML_HIDDEN_TEXT, XML_TOK_TEXT_HIDDEN_TEXT },
+    { XML_NAMESPACE_TEXT, XML_PLACEHOLDER, XML_TOK_TEXT_PLACEHOLDER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_placeholder) },
+    { XML_NAMESPACE_TEXT, XML_HIDDEN_TEXT, XML_TOK_TEXT_HIDDEN_TEXT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_hidden_text) },
     { XML_NAMESPACE_TEXT, XML_HIDDEN_PARAGRAPH,
-      XML_TOK_TEXT_HIDDEN_PARAGRAPH },
+      XML_TOK_TEXT_HIDDEN_PARAGRAPH,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_hidden_paragraph) },
     { XML_NAMESPACE_TEXT, XML_CONDITIONAL_TEXT,
-      XML_TOK_TEXT_CONDITIONAL_TEXT },
-    { XML_NAMESPACE_TEXT, XML_FILE_NAME, XML_TOK_TEXT_FILENAME },
-    { XML_NAMESPACE_TEXT, XML_CHAPTER,  XML_TOK_TEXT_CHAPTER },
-    { XML_NAMESPACE_TEXT, XML_TEMPLATE_NAME, XML_TOK_TEXT_TEMPLATENAME },
-    { XML_NAMESPACE_TEXT, XML_PARAGRAPH_COUNT, XML_TOK_TEXT_PARAGRAPH_COUNT },
-    { XML_NAMESPACE_TEXT, XML_WORD_COUNT, XML_TOK_TEXT_WORD_COUNT },
-    { XML_NAMESPACE_TEXT, XML_TABLE_COUNT, XML_TOK_TEXT_TABLE_COUNT },
-    { XML_NAMESPACE_TEXT, XML_CHARACTER_COUNT, XML_TOK_TEXT_CHARACTER_COUNT },
-    { XML_NAMESPACE_TEXT, XML_IMAGE_COUNT, XML_TOK_TEXT_IMAGE_COUNT },
-    { XML_NAMESPACE_TEXT, XML_OBJECT_COUNT, XML_TOK_TEXT_OBJECT_COUNT },
-    { XML_NAMESPACE_TEXT, XML_PAGE_COUNT, XML_TOK_TEXT_PAGE_COUNT },
-    { XML_NAMESPACE_TEXT, XML_PAGE_VARIABLE_GET, XML_TOK_TEXT_GET_PAGE_VAR },
-    { XML_NAMESPACE_TEXT, XML_PAGE_VARIABLE_SET, XML_TOK_TEXT_SET_PAGE_VAR },
-    { XML_NAMESPACE_TEXT, XML_EXECUTE_MACRO, XML_TOK_TEXT_MACRO },
-    { XML_NAMESPACE_TEXT, XML_DDE_CONNECTION, XML_TOK_TEXT_DDE },
-    { XML_NAMESPACE_TEXT, XML_REFERENCE_REF, XML_TOK_TEXT_REFERENCE_REF },
-    { XML_NAMESPACE_TEXT, XML_BOOKMARK_REF, XML_TOK_TEXT_BOOKMARK_REF },
-    { XML_NAMESPACE_TEXT, XML_SEQUENCE_REF, XML_TOK_TEXT_SEQUENCE_REF },
-    { XML_NAMESPACE_TEXT, XML_NOTE_REF, XML_TOK_TEXT_NOTE_REF },
+      XML_TOK_TEXT_CONDITIONAL_TEXT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_conditional_text) },
+    { XML_NAMESPACE_TEXT, XML_FILE_NAME, XML_TOK_TEXT_FILENAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_file_name) },
+    { XML_NAMESPACE_TEXT, XML_CHAPTER,  XML_TOK_TEXT_CHAPTER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_chapter) },
+    { XML_NAMESPACE_TEXT, XML_TEMPLATE_NAME, XML_TOK_TEXT_TEMPLATENAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_template_name) },
+    { XML_NAMESPACE_TEXT, XML_PARAGRAPH_COUNT, XML_TOK_TEXT_PARAGRAPH_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_paragraph_count) },
+    { XML_NAMESPACE_TEXT, XML_WORD_COUNT, XML_TOK_TEXT_WORD_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_word_count) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_COUNT, XML_TOK_TEXT_TABLE_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_count) },
+    { XML_NAMESPACE_TEXT, XML_CHARACTER_COUNT, XML_TOK_TEXT_CHARACTER_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_character_count) },
+    { XML_NAMESPACE_TEXT, XML_IMAGE_COUNT, XML_TOK_TEXT_IMAGE_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_image_count) },
+    { XML_NAMESPACE_TEXT, XML_OBJECT_COUNT, XML_TOK_TEXT_OBJECT_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_object_count) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_COUNT, XML_TOK_TEXT_PAGE_COUNT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_count) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_VARIABLE_GET, XML_TOK_TEXT_GET_PAGE_VAR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_variable_get) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_VARIABLE_SET, XML_TOK_TEXT_SET_PAGE_VAR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_variable_set) },
+    { XML_NAMESPACE_TEXT, XML_EXECUTE_MACRO, XML_TOK_TEXT_MACRO,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_execute_macro) },
+    { XML_NAMESPACE_TEXT, XML_DDE_CONNECTION, XML_TOK_TEXT_DDE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_dde_connection) },
+    { XML_NAMESPACE_TEXT, XML_REFERENCE_REF, XML_TOK_TEXT_REFERENCE_REF,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_reference_ref) },
+    { XML_NAMESPACE_TEXT, XML_BOOKMARK_REF, XML_TOK_TEXT_BOOKMARK_REF,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bookmark_ref) },
+    { XML_NAMESPACE_TEXT, XML_SEQUENCE_REF, XML_TOK_TEXT_SEQUENCE_REF,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sequence_ref) },
+    { XML_NAMESPACE_TEXT, XML_NOTE_REF, XML_TOK_TEXT_NOTE_REF,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_note_ref) },
     { XML_NAMESPACE_TEXT, XML_BIBLIOGRAPHY_MARK,
-      XML_TOK_TEXT_BIBLIOGRAPHY_MARK },
-    { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TEXT_ANNOTATION },
-    { XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, XML_TOK_TEXT_ANNOTATION_END },
-    { XML_NAMESPACE_TEXT, XML_SCRIPT, XML_TOK_TEXT_SCRIPT },
-    { XML_NAMESPACE_TEXT, XML_TABLE_FORMULA, XML_TOK_TEXT_TABLE_FORMULA },
-    { XML_NAMESPACE_TEXT, XML_DROP_DOWN, XML_TOK_TEXT_DROP_DOWN },
+      XML_TOK_TEXT_BIBLIOGRAPHY_MARK,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_bibliography_mark) },
+    { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TEXT_ANNOTATION,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_annotation) },
+    { XML_NAMESPACE_OFFICE, XML_ANNOTATION_END, XML_TOK_TEXT_ANNOTATION_END,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_annotation_end) },
+    { XML_NAMESPACE_TEXT, XML_SCRIPT, XML_TOK_TEXT_SCRIPT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_script) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_FORMULA, XML_TOK_TEXT_TABLE_FORMULA,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_formula) },
+    { XML_NAMESPACE_TEXT, XML_DROP_DOWN, XML_TOK_TEXT_DROP_DOWN,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_drop_down) },
 
     // Calc fields
-    { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_TEXT_SHEET_NAME },
+    { XML_NAMESPACE_TEXT, XML_SHEET_NAME, XML_TOK_TEXT_SHEET_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_sheet_name) },
 
     // draw fields
-    { XML_NAMESPACE_TEXT, XML_MEASURE,  XML_TOK_TEXT_MEASURE },
+    { XML_NAMESPACE_TEXT, XML_MEASURE,  XML_TOK_TEXT_MEASURE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_measure) },
 
     // RDF metadata
-    { XML_NAMESPACE_TEXT, XML_META,         XML_TOK_TEXT_META },
-    { XML_NAMESPACE_TEXT, XML_META_FIELD,   XML_TOK_TEXT_META_FIELD },
+    { XML_NAMESPACE_TEXT, XML_META,         XML_TOK_TEXT_META,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_meta) },
+    { XML_NAMESPACE_TEXT, XML_META_FIELD,   XML_TOK_TEXT_META_FIELD,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_meta_field) },
 
     // redlining (aka change tracking)
-    { XML_NAMESPACE_TEXT, XML_CHANGE_START, XML_TOK_TEXTP_CHANGE_START },
-    { XML_NAMESPACE_TEXT, XML_CHANGE_END  , XML_TOK_TEXTP_CHANGE_END },
-    { XML_NAMESPACE_TEXT, XML_CHANGE, XML_TOK_TEXTP_CHANGE },
-
-    { XML_NAMESPACE_PRESENTATION, XML_HEADER, XML_TOK_DRAW_HEADER },
-    { XML_NAMESPACE_PRESENTATION, XML_FOOTER, XML_TOK_DRAW_FOOTER },
-    { XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, XML_TOK_DRAW_DATE_TIME },
-    { XML_NAMESPACE_TEXT, XML_PAGE_CONTINUATION, XML_TOK_TEXT_PAGE_CONTINUATION },
-
-    { XML_NAMESPACE_FIELD, XML_FIELDMARK, XML_TOK_TEXT_FIELDMARK },
-    { XML_NAMESPACE_FIELD, XML_FIELDMARK_START, XML_TOK_TEXT_FIELDMARK_START },
-    { XML_NAMESPACE_FIELD, XML_FIELDMARK_END, XML_TOK_TEXT_FIELDMARK_END },
+    { XML_NAMESPACE_TEXT, XML_CHANGE_START, XML_TOK_TEXTP_CHANGE_START,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change_start) },
+    { XML_NAMESPACE_TEXT, XML_CHANGE_END  , XML_TOK_TEXTP_CHANGE_END,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change_end) },
+    { XML_NAMESPACE_TEXT, XML_CHANGE, XML_TOK_TEXTP_CHANGE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_change) },
+
+    { XML_NAMESPACE_PRESENTATION, XML_HEADER, XML_TOK_DRAW_HEADER,
+        (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_header) },
+    { XML_NAMESPACE_PRESENTATION, XML_FOOTER, XML_TOK_DRAW_FOOTER,
+        (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_footer) },
+    { XML_NAMESPACE_PRESENTATION, XML_DATE_TIME, XML_TOK_DRAW_DATE_TIME,
+        (NAMESPACE | XML_NAMESPACE_PRESENTATION | XML_date_time) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_CONTINUATION, XML_TOK_TEXT_PAGE_CONTINUATION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_continuation) },
+
+    { XML_NAMESPACE_FIELD, XML_FIELDMARK, XML_TOK_TEXT_FIELDMARK,
+        (NAMESPACE | XML_NAMESPACE_FIELD | XML_fieldmark) },
+    { XML_NAMESPACE_FIELD, XML_FIELDMARK_START, XML_TOK_TEXT_FIELDMARK_START,
+        (NAMESPACE | XML_NAMESPACE_FIELD | XML_fieldmark_start) },
+    { XML_NAMESPACE_FIELD, XML_FIELDMARK_END, XML_TOK_TEXT_FIELDMARK_END,
+        (NAMESPACE | XML_NAMESPACE_FIELD | XML_fieldmark_end) },
 
 
     XML_TOKEN_MAP_END
@@ -292,190 +442,313 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
 
 static const SvXMLTokenMapEntry aTextPAttrTokenMap[] =
 {
-    { XML_NAMESPACE_XML  , XML_ID,          XML_TOK_TEXT_P_XMLID },
-    { XML_NAMESPACE_XHTML, XML_ABOUT,       XML_TOK_TEXT_P_ABOUT },
-    { XML_NAMESPACE_XHTML, XML_PROPERTY,    XML_TOK_TEXT_P_PROPERTY },
-    { XML_NAMESPACE_XHTML, XML_CONTENT,     XML_TOK_TEXT_P_CONTENT },
-    { XML_NAMESPACE_XHTML, XML_DATATYPE,    XML_TOK_TEXT_P_DATATYPE },
-    { XML_NAMESPACE_TEXT, XML_ID,           XML_TOK_TEXT_P_TEXTID },
-    { XML_NAMESPACE_TEXT, XML_STYLE_NAME,   XML_TOK_TEXT_P_STYLE_NAME },
+    { XML_NAMESPACE_XML  , XML_ID,          XML_TOK_TEXT_P_XMLID,
+        (NAMESPACE | XML_NAMESPACE_XML | XML_id) },
+    { XML_NAMESPACE_XHTML, XML_ABOUT,       XML_TOK_TEXT_P_ABOUT,
+        (NAMESPACE | XML_NAMESPACE_XHTML | XML_about) },
+    { XML_NAMESPACE_XHTML, XML_PROPERTY,    XML_TOK_TEXT_P_PROPERTY,
+        (NAMESPACE | XML_NAMESPACE_XHTML | XML_property) },
+    { XML_NAMESPACE_XHTML, XML_CONTENT,     XML_TOK_TEXT_P_CONTENT,
+        (NAMESPACE | XML_NAMESPACE_XHTML | XML_content) },
+    { XML_NAMESPACE_XHTML, XML_DATATYPE,    XML_TOK_TEXT_P_DATATYPE,
+        (NAMESPACE | XML_NAMESPACE_XHTML | XML_datatype) },
+    { XML_NAMESPACE_TEXT, XML_ID,           XML_TOK_TEXT_P_TEXTID,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_id) },
+    { XML_NAMESPACE_TEXT, XML_STYLE_NAME,   XML_TOK_TEXT_P_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name) },
     { XML_NAMESPACE_TEXT, XML_COND_STYLE_NAME,
-                                            XML_TOK_TEXT_P_COND_STYLE_NAME },
-    { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL,XML_TOK_TEXT_P_LEVEL },
-    { XML_NAMESPACE_TEXT, XML_IS_LIST_HEADER,XML_TOK_TEXT_P_IS_LIST_HEADER },
-    { XML_NAMESPACE_TEXT, XML_RESTART_NUMBERING,XML_TOK_TEXT_P_RESTART_NUMBERING },
-    { XML_NAMESPACE_TEXT, XML_START_VALUE,XML_TOK_TEXT_P_START_VALUE },
+                                            XML_TOK_TEXT_P_COND_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_cond_style_name) },
+    { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL,XML_TOK_TEXT_P_LEVEL,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_outline_level) },
+    { XML_NAMESPACE_TEXT, XML_IS_LIST_HEADER,XML_TOK_TEXT_P_IS_LIST_HEADER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_is_list_header) },
+    { XML_NAMESPACE_TEXT, XML_RESTART_NUMBERING,XML_TOK_TEXT_P_RESTART_NUMBERING,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_restart_numbering) },
+    { XML_NAMESPACE_TEXT, XML_START_VALUE,XML_TOK_TEXT_P_START_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_start_value) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextNumberedParagraphAttrTokenMap[] =
 {
-    { XML_NAMESPACE_XML , XML_ID,    XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID },
+    { XML_NAMESPACE_XML , XML_ID,    XML_TOK_TEXT_NUMBERED_PARAGRAPH_XMLID,
+        (NAMESPACE | XML_NAMESPACE_XML | XML_id) },
     { XML_NAMESPACE_TEXT, XML_LIST_ID,
-        XML_TOK_TEXT_NUMBERED_PARAGRAPH_LIST_ID },
-    { XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_NUMBERED_PARAGRAPH_LEVEL },
+        XML_TOK_TEXT_NUMBERED_PARAGRAPH_LIST_ID,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_list_id) },
+    { XML_NAMESPACE_TEXT, XML_LEVEL, XML_TOK_TEXT_NUMBERED_PARAGRAPH_LEVEL,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_level) },
     { XML_NAMESPACE_TEXT, XML_STYLE_NAME,
-        XML_TOK_TEXT_NUMBERED_PARAGRAPH_STYLE_NAME },
+        XML_TOK_TEXT_NUMBERED_PARAGRAPH_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name) },
     { XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING,
-        XML_TOK_TEXT_NUMBERED_PARAGRAPH_CONTINUE_NUMBERING },
+        XML_TOK_TEXT_NUMBERED_PARAGRAPH_CONTINUE_NUMBERING,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_continue_numbering) },
     { XML_NAMESPACE_TEXT, XML_START_VALUE,
-        XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE },
+        XML_TOK_TEXT_NUMBERED_PARAGRAPH_START_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_start_value) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
 {
-    { XML_NAMESPACE_XML , XML_ID,           XML_TOK_TEXT_LIST_BLOCK_XMLID },
+    { XML_NAMESPACE_XML , XML_ID,           XML_TOK_TEXT_LIST_BLOCK_XMLID,
+        (NAMESPACE | XML_NAMESPACE_XML | XML_id) },
     { XML_NAMESPACE_TEXT, XML_STYLE_NAME,
-            XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME },
+            XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name) },
     { XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING,
-            XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING },
+            XML_TOK_TEXT_LIST_BLOCK_CONTINUE_NUMBERING,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_continue_numbering) },
     { XML_NAMESPACE_TEXT, XML_CONTINUE_LIST,
-            XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST },
+            XML_TOK_TEXT_LIST_BLOCK_CONTINUE_LIST,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_continue_list) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextListBlockElemTokenMap[] =
 {
-    { XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER },
-    { XML_NAMESPACE_TEXT, XML_LIST_ITEM,    XML_TOK_TEXT_LIST_ITEM   },
+    { XML_NAMESPACE_TEXT, XML_LIST_HEADER, XML_TOK_TEXT_LIST_HEADER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_list_header) },
+    { XML_NAMESPACE_TEXT, XML_LIST_ITEM,    XML_TOK_TEXT_LIST_ITEM,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_list_item) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextFrameAttrTokenMap[] =
 {
-    { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME },
-    { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME },
-    { XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_TOK_TEXT_FRAME_ANCHOR_TYPE },
-    { XML_NAMESPACE_TEXT, XML_ANCHOR_PAGE_NUMBER, XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER },
-    { XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXT_FRAME_X },
-    { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXT_FRAME_Y },
-    { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_FRAME_WIDTH },
-    { XML_NAMESPACE_FO, XML_MIN_WIDTH, XML_TOK_TEXT_FRAME_MIN_WIDTH },
-    { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_TEXT_FRAME_REL_WIDTH },
-    { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_FRAME_HEIGHT },
-    { XML_NAMESPACE_FO, XML_MIN_HEIGHT, XML_TOK_TEXT_FRAME_MIN_HEIGHT },
-    { XML_NAMESPACE_STYLE, XML_REL_HEIGHT, XML_TOK_TEXT_FRAME_REL_HEIGHT },
-    { XML_NAMESPACE_DRAW, XML_CHAIN_NEXT_NAME, XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME },
-    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_FRAME_HREF },
-    { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_FILTER_NAME },
-    { XML_NAMESPACE_DRAW, XML_ZINDEX, XML_TOK_TEXT_FRAME_Z_INDEX },
-    { XML_NAMESPACE_SVG, XML_TRANSFORM, XML_TOK_TEXT_FRAME_TRANSFORM },
-    { XML_NAMESPACE_DRAW, XML_CLASS_ID, XML_TOK_TEXT_FRAME_CLASS_ID },
-    { XML_NAMESPACE_DRAW,   XML_CODE,           XML_TOK_TEXT_FRAME_CODE },
-    { XML_NAMESPACE_DRAW,   XML_OBJECT,         XML_TOK_TEXT_FRAME_OBJECT },
-    { XML_NAMESPACE_DRAW,   XML_ARCHIVE,        XML_TOK_TEXT_FRAME_ARCHIVE },
-    { XML_NAMESPACE_DRAW,   XML_MAY_SCRIPT,     XML_TOK_TEXT_FRAME_MAY_SCRIPT },
-    { XML_NAMESPACE_DRAW,   XML_MIME_TYPE,  XML_TOK_TEXT_FRAME_MIME_TYPE },
-    { XML_NAMESPACE_DRAW, XML_APPLET_NAME, XML_TOK_TEXT_FRAME_APPLET_NAME },
-    { XML_NAMESPACE_DRAW, XML_FRAME_NAME, XML_TOK_TEXT_FRAME_FRAME_NAME },
-    { XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_RANGES, XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE },
-    { XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_TABLE, XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE },
+    { XML_NAMESPACE_DRAW, XML_STYLE_NAME, XML_TOK_TEXT_FRAME_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_style_name) },
+    { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_name) },
+    { XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_TOK_TEXT_FRAME_ANCHOR_TYPE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_anchor_type) },
+    { XML_NAMESPACE_TEXT, XML_ANCHOR_PAGE_NUMBER, XML_TOK_TEXT_FRAME_ANCHOR_PAGE_NUMBER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_anchor_page_number) },
+    { XML_NAMESPACE_SVG, XML_X, XML_TOK_TEXT_FRAME_X,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_x) },
+    { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TEXT_FRAME_Y,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_y) },
+    { XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_TEXT_FRAME_WIDTH,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_width) },
+    { XML_NAMESPACE_FO, XML_MIN_WIDTH, XML_TOK_TEXT_FRAME_MIN_WIDTH,
+        (NAMESPACE | XML_NAMESPACE_FO | XML_min_width) },
+    { XML_NAMESPACE_STYLE, XML_REL_WIDTH, XML_TOK_TEXT_FRAME_REL_WIDTH,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_rel_width) },
+    { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_TEXT_FRAME_HEIGHT,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_height) },
+    { XML_NAMESPACE_FO, XML_MIN_HEIGHT, XML_TOK_TEXT_FRAME_MIN_HEIGHT,
+        (NAMESPACE | XML_NAMESPACE_FO | XML_min_height) },
+    { XML_NAMESPACE_STYLE, XML_REL_HEIGHT, XML_TOK_TEXT_FRAME_REL_HEIGHT,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_rel_height) },
+    { XML_NAMESPACE_DRAW, XML_CHAIN_NEXT_NAME, XML_TOK_TEXT_FRAME_NEXT_CHAIN_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_chain_next_name) },
+    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_FRAME_HREF,
+        (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+    { XML_NAMESPACE_DRAW, XML_NAME, XML_TOK_TEXT_FRAME_FILTER_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_name) },
+    { XML_NAMESPACE_DRAW, XML_ZINDEX, XML_TOK_TEXT_FRAME_Z_INDEX,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_z_index) },
+    { XML_NAMESPACE_SVG, XML_TRANSFORM, XML_TOK_TEXT_FRAME_TRANSFORM,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_transform) },
+    { XML_NAMESPACE_DRAW, XML_CLASS_ID, XML_TOK_TEXT_FRAME_CLASS_ID,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_class_id) },
+    { XML_NAMESPACE_DRAW,   XML_CODE,           XML_TOK_TEXT_FRAME_CODE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_code) },
+    { XML_NAMESPACE_DRAW,   XML_OBJECT,         XML_TOK_TEXT_FRAME_OBJECT,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_object) },
+    { XML_NAMESPACE_DRAW,   XML_ARCHIVE,        XML_TOK_TEXT_FRAME_ARCHIVE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_archive) },
+    { XML_NAMESPACE_DRAW,   XML_MAY_SCRIPT,     XML_TOK_TEXT_FRAME_MAY_SCRIPT,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_may_script) },
+    { XML_NAMESPACE_DRAW,   XML_MIME_TYPE,  XML_TOK_TEXT_FRAME_MIME_TYPE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_mime_type) },
+    { XML_NAMESPACE_DRAW, XML_APPLET_NAME, XML_TOK_TEXT_FRAME_APPLET_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_applet_name) },
+    { XML_NAMESPACE_DRAW, XML_FRAME_NAME, XML_TOK_TEXT_FRAME_FRAME_NAME,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_frame_name) },
+    { XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_RANGES, XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_notify_on_update_of_ranges) },
+    { XML_NAMESPACE_DRAW, XML_NOTIFY_ON_UPDATE_OF_TABLE, XML_TOK_TEXT_FRAME_NOTIFY_ON_UPDATE,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_notify_on_update_of_table) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextContourAttrTokenMap[] =
 {
-    { XML_NAMESPACE_SVG, XML_WIDTH,     XML_TOK_TEXT_CONTOUR_WIDTH      },
-    { XML_NAMESPACE_SVG, XML_HEIGHT,    XML_TOK_TEXT_CONTOUR_HEIGHT     },
-    { XML_NAMESPACE_SVG, XML_VIEWBOX,   XML_TOK_TEXT_CONTOUR_VIEWBOX    },
-    { XML_NAMESPACE_SVG, XML_D,         XML_TOK_TEXT_CONTOUR_D          },
-    { XML_NAMESPACE_DRAW,XML_POINTS,    XML_TOK_TEXT_CONTOUR_POINTS     },
-    { XML_NAMESPACE_DRAW,XML_RECREATE_ON_EDIT,  XML_TOK_TEXT_CONTOUR_AUTO   },
+    { XML_NAMESPACE_SVG, XML_WIDTH,     XML_TOK_TEXT_CONTOUR_WIDTH,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_width) },
+    { XML_NAMESPACE_SVG, XML_HEIGHT,    XML_TOK_TEXT_CONTOUR_HEIGHT,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_height) },
+    { XML_NAMESPACE_SVG, XML_VIEWBOX,   XML_TOK_TEXT_CONTOUR_VIEWBOX,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_viewBox) },
+    { XML_NAMESPACE_SVG, XML_D,         XML_TOK_TEXT_CONTOUR_D,
+        (NAMESPACE | XML_NAMESPACE_SVG | XML_d) },
+    { XML_NAMESPACE_DRAW,XML_POINTS,    XML_TOK_TEXT_CONTOUR_POINTS,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_points) },
+    { XML_NAMESPACE_DRAW,XML_RECREATE_ON_EDIT,  XML_TOK_TEXT_CONTOUR_AUTO,
+        (NAMESPACE | XML_NAMESPACE_DRAW | XML_recreate_on_edit) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextHyperlinkAttrTokenMap[] =
 {
-    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF },
-    { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME },
-    { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_TEXT_HYPERLINK_SHOW },
-    { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, XML_TOK_TEXT_HYPERLINK_TARGET_FRAME },
-    { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_HYPERLINK_STYLE_NAME },
-    { XML_NAMESPACE_TEXT, XML_VISITED_STYLE_NAME, XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME },
-    { XML_NAMESPACE_OFFICE, XML_SERVER_MAP, XML_TOK_TEXT_HYPERLINK_SERVER_MAP },
+    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXT_HYPERLINK_HREF,
+        (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
+    { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_HYPERLINK_NAME,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_name) },
+    { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_TEXT_HYPERLINK_SHOW,
+        (NAMESPACE | XML_NAMESPACE_XLINK | XML_show) },
+    { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME, XML_TOK_TEXT_HYPERLINK_TARGET_FRAME,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_target_frame_name) },
+    { XML_NAMESPACE_TEXT, XML_STYLE_NAME, XML_TOK_TEXT_HYPERLINK_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_style_name) },
+    { XML_NAMESPACE_TEXT, XML_VISITED_STYLE_NAME, XML_TOK_TEXT_HYPERLINK_VIS_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_visited_style_name) },
+    { XML_NAMESPACE_OFFICE, XML_SERVER_MAP, XML_TOK_TEXT_HYPERLINK_SERVER_MAP,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_server_map) },
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextMasterPageElemTokenMap[] =
 {
-    { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER },
-    { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER },
-    { XML_NAMESPACE_STYLE, XML_HEADER_LEFT, XML_TOK_TEXT_MP_HEADER_LEFT },
-    { XML_NAMESPACE_STYLE, XML_FOOTER_LEFT, XML_TOK_TEXT_MP_FOOTER_LEFT },
-    { XML_NAMESPACE_STYLE, XML_HEADER_FIRST, XML_TOK_TEXT_MP_HEADER_FIRST },
-    { XML_NAMESPACE_STYLE, XML_FOOTER_FIRST, XML_TOK_TEXT_MP_FOOTER_FIRST },
+    { XML_NAMESPACE_STYLE, XML_HEADER, XML_TOK_TEXT_MP_HEADER,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_header) },
+    { XML_NAMESPACE_STYLE, XML_FOOTER, XML_TOK_TEXT_MP_FOOTER,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_footer) },
+    { XML_NAMESPACE_STYLE, XML_HEADER_LEFT, XML_TOK_TEXT_MP_HEADER_LEFT,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_header_left) },
+    { XML_NAMESPACE_STYLE, XML_FOOTER_LEFT, XML_TOK_TEXT_MP_FOOTER_LEFT,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_footer_left) },
+    { XML_NAMESPACE_STYLE, XML_HEADER_FIRST, XML_TOK_TEXT_MP_HEADER_FIRST,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_header_first) },
+    { XML_NAMESPACE_STYLE, XML_FOOTER_FIRST, XML_TOK_TEXT_MP_FOOTER_FIRST,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_footer_first) },
 
     XML_TOKEN_MAP_END
 };
 
 static const SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
 {
-    { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
-    { XML_NAMESPACE_TEXT, XML_DESCRIPTION,  XML_TOK_TEXTFIELD_DESCRIPTION },
-    { XML_NAMESPACE_TEXT, XML_HELP, XML_TOK_TEXTFIELD_HELP },
-    { XML_NAMESPACE_TEXT, XML_HINT, XML_TOK_TEXTFIELD_HINT },
+    { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_fixed) },
+    { XML_NAMESPACE_TEXT, XML_DESCRIPTION,  XML_TOK_TEXTFIELD_DESCRIPTION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_description) },
+    { XML_NAMESPACE_TEXT, XML_HELP, XML_TOK_TEXTFIELD_HELP,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_help) },
+    { XML_NAMESPACE_TEXT, XML_HINT, XML_TOK_TEXTFIELD_HINT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_hint) },
     { XML_NAMESPACE_TEXT, XML_PLACEHOLDER_TYPE,
-                XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE },
-    { XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_TEXTFIELD_NAME },
-    { XML_NAMESPACE_TEXT, XML_FORMULA, XML_TOK_TEXTFIELD_FORMULA },
-    { XML_NAMESPACE_STYLE, XML_NUM_FORMAT, XML_TOK_TEXTFIELD_NUM_FORMAT },
+                XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_placeholder_type) },
+    { XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_TEXTFIELD_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_name) },
+    { XML_NAMESPACE_TEXT, XML_FORMULA, XML_TOK_TEXTFIELD_FORMULA,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_formula) },
+    { XML_NAMESPACE_STYLE, XML_NUM_FORMAT, XML_TOK_TEXTFIELD_NUM_FORMAT,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_num_format) },
     { XML_NAMESPACE_STYLE, XML_NUM_LETTER_SYNC,
-                XML_TOK_TEXTFIELD_NUM_LETTER_SYNC },
+                XML_TOK_TEXTFIELD_NUM_LETTER_SYNC,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_num_letter_sync) },
     { XML_NAMESPACE_TEXT, XML_DISPLAY_FORMULA,
-                XML_TOK_TEXTFIELD_DISPLAY_FORMULA },
-    { XML_NAMESPACE_TEXT, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE }, // #i32362#: src680m48++ saves text:value-type
-    { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE },
-    { XML_NAMESPACE_TEXT, XML_VALUE, XML_TOK_TEXTFIELD_VALUE },
-    { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TEXTFIELD_VALUE },
-    { XML_NAMESPACE_TEXT, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE },
-    { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE },
-    { XML_NAMESPACE_TEXT, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE },
-    { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE },
-    { XML_NAMESPACE_TEXT, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE },
-    { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE },
-    { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TEXTFIELD_BOOL_VALUE},
-    { XML_NAMESPACE_OFFICE, XML_CURRENCY, XML_TOK_TEXTFIELD_CURRENCY},
+                XML_TOK_TEXTFIELD_DISPLAY_FORMULA,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_display_formula) },
+    { XML_NAMESPACE_TEXT, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_value_type) }, // #i32362#: src680m48++ saves text:value-type
+    { XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_TOK_TEXTFIELD_VALUE_TYPE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_value_type) },
+    { XML_NAMESPACE_TEXT, XML_VALUE, XML_TOK_TEXTFIELD_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_value) },
+    { XML_NAMESPACE_OFFICE, XML_VALUE, XML_TOK_TEXTFIELD_VALUE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_value) },
+    { XML_NAMESPACE_TEXT, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_string_value) },
+    { XML_NAMESPACE_OFFICE, XML_STRING_VALUE, XML_TOK_TEXTFIELD_STRING_VALUE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_string_value) },
+    { XML_NAMESPACE_TEXT, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE,
+            (NAMESPACE | XML_NAMESPACE_TEXT | XML_date_value) },
+    { XML_NAMESPACE_OFFICE, XML_DATE_VALUE, XML_TOK_TEXTFIELD_DATE_VALUE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_date_value) },
+    { XML_NAMESPACE_TEXT, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_time_value) },
+    { XML_NAMESPACE_OFFICE, XML_TIME_VALUE, XML_TOK_TEXTFIELD_TIME_VALUE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_time_value) },
+    { XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE, XML_TOK_TEXTFIELD_BOOL_VALUE,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_boolean_value) },
+    { XML_NAMESPACE_OFFICE, XML_CURRENCY, XML_TOK_TEXTFIELD_CURRENCY,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_currency) },
     { XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME,
-                XML_TOK_TEXTFIELD_DATA_STYLE_NAME },
+                XML_TOK_TEXTFIELD_DATA_STYLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_STYLE | XML_data_style_name) },
     { XML_NAMESPACE_TEXT, XML_DISPLAY_OUTLINE_LEVEL,
-                XML_TOK_TEXTFIELD_NUMBERING_LEVEL },
+                XML_TOK_TEXTFIELD_NUMBERING_LEVEL,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_display_outline_level) },
     { XML_NAMESPACE_TEXT, XML_SEPARATION_CHARACTER,
-                XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR },
-    { XML_NAMESPACE_TEXT, XML_DISPLAY, XML_TOK_TEXTFIELD_DISPLAY },
-    { XML_NAMESPACE_TEXT, XML_TIME_ADJUST, XML_TOK_TEXTFIELD_TIME_ADJUST },
-    { XML_NAMESPACE_TEXT, XML_DATE_ADJUST, XML_TOK_TEXTFIELD_DATE_ADJUST },
-    { XML_NAMESPACE_TEXT, XML_PAGE_ADJUST, XML_TOK_TEXTFIELD_PAGE_ADJUST },
-    { XML_NAMESPACE_TEXT, XML_SELECT_PAGE, XML_TOK_TEXTFIELD_SELECT_PAGE },
-    { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXTFIELD_DATABASE_NAME},
-    { XML_NAMESPACE_TEXT, XML_TABLE_NAME, XML_TOK_TEXTFIELD_TABLE_NAME },
-    { XML_NAMESPACE_TEXT, XML_COLUMN_NAME, XML_TOK_TEXTFIELD_COLUMN_NAME },
-    { XML_NAMESPACE_TEXT, XML_ROW_NUMBER, XML_TOK_TEXTFIELD_ROW_NUMBER },
-    { XML_NAMESPACE_TEXT, XML_CONDITION, XML_TOK_TEXTFIELD_CONDITION },
+                XML_TOK_TEXTFIELD_NUMBERING_SEPARATOR,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_separation_character) },
+    { XML_NAMESPACE_TEXT, XML_DISPLAY, XML_TOK_TEXTFIELD_DISPLAY,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_display) },
+    { XML_NAMESPACE_TEXT, XML_TIME_ADJUST, XML_TOK_TEXTFIELD_TIME_ADJUST,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_time_adjust) },
+    { XML_NAMESPACE_TEXT, XML_DATE_ADJUST, XML_TOK_TEXTFIELD_DATE_ADJUST,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_date_adjust) },
+    { XML_NAMESPACE_TEXT, XML_PAGE_ADJUST, XML_TOK_TEXTFIELD_PAGE_ADJUST,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_page_adjust) },
+    { XML_NAMESPACE_TEXT, XML_SELECT_PAGE, XML_TOK_TEXTFIELD_SELECT_PAGE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_select_page) },
+    { XML_NAMESPACE_TEXT, XML_DATABASE_NAME, XML_TOK_TEXTFIELD_DATABASE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_database_name) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_NAME, XML_TOK_TEXTFIELD_TABLE_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_name) },
+    { XML_NAMESPACE_TEXT, XML_COLUMN_NAME, XML_TOK_TEXTFIELD_COLUMN_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_column_name) },
+    { XML_NAMESPACE_TEXT, XML_ROW_NUMBER, XML_TOK_TEXTFIELD_ROW_NUMBER,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_row_number) },
+    { XML_NAMESPACE_TEXT, XML_CONDITION, XML_TOK_TEXTFIELD_CONDITION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_condition) },
     { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_TRUE,
-                XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE },
+                XML_TOK_TEXTFIELD_STRING_VALUE_IF_TRUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_string_value_if_true) },
     { XML_NAMESPACE_TEXT, XML_STRING_VALUE_IF_FALSE,
-                XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE },
-    { XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION },
-    { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL},
-    { XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE },
-    { XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_TOK_TEXTFIELD_NOTE_CLASS },
+                XML_TOK_TEXTFIELD_STRING_VALUE_IF_FALSE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_string_value_if_false) },
+    { XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_editing_cycles) },
+    { XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_outline_level) },
+    { XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_active) },
+    { XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_TOK_TEXTFIELD_NOTE_CLASS,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_note_class) },
     { XML_NAMESPACE_TEXT, XML_REFERENCE_FORMAT,
-                XML_TOK_TEXTFIELD_REFERENCE_FORMAT },
-    { XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME },
+                XML_TOK_TEXTFIELD_REFERENCE_FORMAT,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_reference_format) },
+    { XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_ref_name) },
     { XML_NAMESPACE_TEXT, XML_CONNECTION_NAME,
-      XML_TOK_TEXTFIELD_CONNECTION_NAME },
-    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXTFIELD_HREF },
+      XML_TOK_TEXTFIELD_CONNECTION_NAME,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_connection_name) },
+    { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TEXTFIELD_HREF,
+        (NAMESPACE | XML_NAMESPACE_XLINK | XML_href) },
     { XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
-      XML_TOK_TEXTFIELD_TARGET_FRAME },
-    { XML_NAMESPACE_TEXT, XML_ANNOTATION, XML_TOK_TEXTFIELD_ANNOTATION },
-    { XML_NAMESPACE_SCRIPT, XML_LANGUAGE, XML_TOK_TEXTFIELD_LANGUAGE },
-    { XML_NAMESPACE_TEXT, XML_KIND, XML_TOK_TEXTFIELD_MEASURE_KIND },
-    { XML_NAMESPACE_TEXT, XML_IS_HIDDEN, XML_TOK_TEXTFIELD_IS_HIDDEN },
+      XML_TOK_TEXTFIELD_TARGET_FRAME,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_target_frame_name) },
+    { XML_NAMESPACE_TEXT, XML_ANNOTATION, XML_TOK_TEXTFIELD_ANNOTATION,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_annotation) },
+    { XML_NAMESPACE_SCRIPT, XML_LANGUAGE, XML_TOK_TEXTFIELD_LANGUAGE,
+        (NAMESPACE | XML_NAMESPACE_SCRIPT | XML_language) },
+    { XML_NAMESPACE_TEXT, XML_KIND, XML_TOK_TEXTFIELD_MEASURE_KIND,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_kind) },
+    { XML_NAMESPACE_TEXT, XML_IS_HIDDEN, XML_TOK_TEXTFIELD_IS_HIDDEN,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_is_hidden) },
     { XML_NAMESPACE_TEXT, XML_CURRENT_VALUE,
-                XML_TOK_TEXTFIELD_CURRENT_VALUE },
-    { XML_NAMESPACE_TEXT, XML_TABLE_TYPE, XML_TOK_TEXTFIELD_TABLE_TYPE },
-    { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_NAME },
+                XML_TOK_TEXTFIELD_CURRENT_VALUE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_current_value) },
+    { XML_NAMESPACE_TEXT, XML_TABLE_TYPE, XML_TOK_TEXTFIELD_TABLE_TYPE,
+        (NAMESPACE | XML_NAMESPACE_TEXT | XML_table_type) },
+    { XML_NAMESPACE_OFFICE, XML_NAME, XML_TOK_TEXT_NAME,
+        (NAMESPACE | XML_NAMESPACE_OFFICE | XML_name) },
 
     XML_TOKEN_MAP_END
 };


More information about the Libreoffice-commits mailing list