xmloff/source/transform/OOo2Oasis.cxx        | 1180 +++++++++++----------------
 xmloff/source/transform/Oasis2OOo.cxx        | 1045 +++++++++++------------
 xmloff/source/transform/StyleOOoTContext.cxx |   56 -
 3 files changed, 992 insertions(+), 1289 deletions(-)

New commits:
commit 24b15bc11b57aaeb3961b26ab636c3cf2d18fddc
Author:     Vojtěch Doležal <dolez...@cvut.cz>
AuthorDate: Tue May 16 09:02:45 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed May 17 08:48:43 2023 +0200

    Removed more constant concatenations
    
    Change-Id: I4fce6eeb6652914e1883037b41a2dc3c09a88ada
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151826
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/xmloff/source/transform/OOo2Oasis.cxx 
b/xmloff/source/transform/OOo2Oasis.cxx
index a11baa98a8e9..150de69aebc6 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -76,7 +76,7 @@ enum XMLUserDefinedTransformerAction
 }
 
 #define ENTRY3( n, l, a, p1, p2, p3 ) \
-    { XML_NAMESPACE_##n, XML_##l, a, p1, p2, p3 }
+    { n, l, a, p1, p2, p3 }
 #define ENTRY3QQN( n, l, a, n1, l1, n2, l2, p3 ) \
     ENTRY3( n, l, a, XMLTransformerActionInit::QNameParam( n1, l1 ), \
             XMLTransformerActionInit::QNameParam( n2, l2 ), p3 )
@@ -104,613 +104,447 @@ static constexpr sal_Int32 RENAME_ENTRY( XMLTokenEnum 
f, XMLTokenEnum s )
 XMLTransformerActionInit const aActionTable[] =
 {
     // remove office:class from <office:document> and <office:document-content>
-    ENTRY0( OFFICE, DOCUMENT, XML_ETACTION_DOCUMENT ),
-    ENTRY0( OFFICE, DOCUMENT_CONTENT, XML_ETACTION_DOCUMENT ),
-    ENTRY0( OFFICE, DOCUMENT_STYLES, XML_ETACTION_DOCUMENT ),
-    ENTRY0( OFFICE, DOCUMENT_SETTINGS, XML_ETACTION_DOCUMENT ),
-    ENTRY1Q( OFFICE, AUTO_TEXT_EVENTS, XML_ETACTION_DOCUMENT_RENAME,
-                          XML_NAMESPACE_OOO, XML_AUTO_TEXT_EVENTS),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_DOCUMENT, XML_ETACTION_DOCUMENT ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_DOCUMENT_CONTENT, XML_ETACTION_DOCUMENT 
),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_DOCUMENT_STYLES, XML_ETACTION_DOCUMENT 
),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_DOCUMENT_SETTINGS, 
XML_ETACTION_DOCUMENT ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_AUTO_TEXT_EVENTS, 
XML_ETACTION_DOCUMENT_RENAME, XML_NAMESPACE_OOO, XML_AUTO_TEXT_EVENTS),
 
     // remove <meta:keywords>
-    ENTRY0( META, KEYWORDS, XML_ETACTION_COPY_CONTENT ),
+    ENTRY0( XML_NAMESPACE_META, XML_KEYWORDS, XML_ETACTION_COPY_CONTENT ),
 
     // rename <office:script> to <office:scripts>
-    ENTRY1Q( OFFICE, SCRIPT, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_OFFICE, XML_SCRIPTS ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_SCRIPT, XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_OFFICE, XML_SCRIPTS ),
 
     // rename <office:script-data> to <office:script> and process attributes
-    ENTRY2QN( OFFICE, SCRIPT_DATA, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_OFFICE, XML_SCRIPT,
-                        OOO_SCRIPT_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_OFFICE, XML_SCRIPT_DATA, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_OFFICE, XML_SCRIPT, 
OOO_SCRIPT_ACTIONS ),
 
     // rename <script:libraries> to <ooo:libraries>
-    ENTRY1Q( SCRIPT, LIBRARIES, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_OOO, XML_LIBRARIES ),
+    ENTRY1Q( XML_NAMESPACE_SCRIPT, XML_LIBRARIES, XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_OOO, XML_LIBRARIES ),
 
     // rename <script:library-linked> to <ooo:library-linked> and process 
attributes
-    ENTRY2QN( SCRIPT, LIBRARY_LINKED, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_OOO, XML_LIBRARY_LINKED,
-                        OOO_SCRIPT_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_SCRIPT, XML_LIBRARY_LINKED, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_OOO, XML_LIBRARY_LINKED, 
OOO_SCRIPT_ACTIONS ),
 
     // rename <script:library-embedded> to <ooo:library-embedded> and process 
attributes
-    ENTRY2QN( SCRIPT, LIBRARY_EMBEDDED, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_OOO, XML_LIBRARY_EMBEDDED,
-                        OOO_SCRIPT_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_SCRIPT, XML_LIBRARY_EMBEDDED, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_OOO, XML_LIBRARY_EMBEDDED, 
OOO_SCRIPT_ACTIONS ),
 
     // rename <script:module> to <ooo:module> and process attributes
-    ENTRY2QN( SCRIPT, MODULE, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_OOO, XML_MODULE,
-                        OOO_SCRIPT_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_SCRIPT, XML_MODULE, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_OOO, XML_MODULE, 
OOO_SCRIPT_ACTIONS ),
 
     // rename <script:source-code> to <ooo:source-code>
-    ENTRY1Q( SCRIPT, SOURCE_CODE, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_OOO, XML_SOURCE_CODE ),
+    ENTRY1Q( XML_NAMESPACE_SCRIPT, XML_SOURCE_CODE, XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_OOO, XML_SOURCE_CODE ),
 
     // rename <office:font-decls> to <office:font-face-decl>,
     // rename <style:font-decl> to <style:font-face>, process attrs
-    ENTRY1Q( OFFICE, FONT_DECLS, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS ),
-    ENTRY2QN( STYLE, FONT_DECL, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_STYLE, XML_FONT_FACE,
-                           OOO_FONT_DECL_ACTIONS ),
+    ENTRY1Q(  XML_NAMESPACE_OFFICE, XML_FONT_DECLS, XML_ETACTION_RENAME_ELEM,  
          XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS ),
+    ENTRY2QN( XML_NAMESPACE_STYLE,  XML_FONT_DECL,  
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_STYLE,  XML_FONT_FACE, 
OOO_FONT_DECL_ACTIONS ),
 
     // add genre element
-    ENTRY0( OFFICE, BODY, XML_ETACTION_BODY ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_BODY, XML_ETACTION_BODY ),
 
     // rename <style:page-master> to <style:page-layout>
-    ENTRY2QN( STYLE, PAGE_MASTER, XML_ETACTION_STYLE_RENAME,
-                        XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT,
-                           XML_FAMILY_TYPE_PAGE_LAYOUT  ),
-    ENTRY1( STYLE, MASTER_PAGE, XML_ETACTION_PROC_ATTRS,
-                        OOO_MASTER_PAGE_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_STYLE, XML_PAGE_MASTER, XML_ETACTION_STYLE_RENAME, 
XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT, XML_FAMILY_TYPE_PAGE_LAYOUT  ),
+    ENTRY1(   XML_NAMESPACE_STYLE, XML_MASTER_PAGE, XML_ETACTION_PROC_ATTRS,   
OOO_MASTER_PAGE_ACTIONS ),
 
     // split <style:properties> into <style:*-properties> and do other
     // styles processing
-    ENTRY1( STYLE, STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_END ),
-    ENTRY1( STYLE, DEFAULT_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_END ),
-    ENTRY1( NUMBER, NUMBER_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( NUMBER, CURRENCY_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( NUMBER, PERCENTAGE_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA 
),
-    ENTRY1( NUMBER, DATE_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( NUMBER, TIME_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( NUMBER, BOOLEAN_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( NUMBER, TEXT_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_DATA ),
-    ENTRY1( TEXT, LIST_STYLE, XML_ETACTION_STYLE, XML_FAMILY_TYPE_LIST ),
-//  ENTRY0( TEXT, OUTLINE_STYLE, STYLE ),
-    ENTRY1( STYLE, HEADER_STYLE, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_HEADER_FOOTER ),
-    ENTRY1( STYLE, FOOTER_STYLE, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_HEADER_FOOTER ),
-    ENTRY1( TEXT, LIST_LEVEL_STYLE_NUMBER, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_LIST ),
-    ENTRY1( TEXT, LIST_LEVEL_STYLE_BULLET, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_LIST ),
-    ENTRY1( TEXT, LIST_LEVEL_STYLE_IMAGE, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_LIST ),
-    ENTRY1( TEXT, OUTLINE_LEVEL_STYLE, XML_ETACTION_STYLE, 
XML_FAMILY_TYPE_LIST ),
-    ENTRY1( DRAW, GRADIENT, XML_ETACTION_STYLE,
-                 XML_FAMILY_TYPE_GRADIENT ),
-    ENTRY1( DRAW, FILL_IMAGE, XML_ETACTION_STYLE,
-                 XML_FAMILY_TYPE_FILL_IMAGE ),
-    ENTRY2QN( DRAW, TRANSPARENCY, XML_ETACTION_STYLE_RENAME,
-                XML_NAMESPACE_DRAW, XML_OPACITY,
-                 XML_FAMILY_TYPE_GRADIENT ),
-    ENTRY1( DRAW, MARKER, XML_ETACTION_STYLE,
-                 XML_FAMILY_TYPE_MARKER ),
-    ENTRY1( DRAW, HATCH, XML_ETACTION_STYLE,
-                 XML_FAMILY_TYPE_HATCH ),
-    ENTRY1( DRAW, STROKE_DASH, XML_ETACTION_STYLE,
-                 XML_FAMILY_TYPE_STROKE_DASH ),
+    ENTRY1(   XML_NAMESPACE_STYLE,  XML_STYLE,                   
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_END ),
+    ENTRY1(   XML_NAMESPACE_STYLE,  XML_DEFAULT_STYLE,           
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_END ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_NUMBER_STYLE,            
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_CURRENCY_STYLE,          
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_PERCENTAGE_STYLE,        
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_DATE_STYLE,              
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_TIME_STYLE,              
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_BOOLEAN_STYLE,           
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_NUMBER, XML_TEXT_STYLE,              
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_DATA ),
+    ENTRY1(   XML_NAMESPACE_TEXT,   XML_LIST_STYLE,              
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_LIST ),
+//  ENTRY0(   XML_NAMESPACE_TEXT,   XML_OUTLINE_STYLE,           STYLE ),
+    ENTRY1(   XML_NAMESPACE_STYLE,  XML_HEADER_STYLE,            
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_HEADER_FOOTER ),
+    ENTRY1(   XML_NAMESPACE_STYLE,  XML_FOOTER_STYLE,            
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_HEADER_FOOTER ),
+    ENTRY1(   XML_NAMESPACE_TEXT,   XML_LIST_LEVEL_STYLE_NUMBER, 
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_LIST ),
+    ENTRY1(   XML_NAMESPACE_TEXT,   XML_LIST_LEVEL_STYLE_BULLET, 
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_LIST ),
+    ENTRY1(   XML_NAMESPACE_TEXT,   XML_LIST_LEVEL_STYLE_IMAGE,  
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_LIST ),
+    ENTRY1(   XML_NAMESPACE_TEXT,   XML_OUTLINE_LEVEL_STYLE,     
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_LIST ),
+    ENTRY1(   XML_NAMESPACE_DRAW,   XML_GRADIENT,                
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_GRADIENT ),
+    ENTRY1(   XML_NAMESPACE_DRAW,   XML_FILL_IMAGE,              
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_FILL_IMAGE ),
+    ENTRY2QN( XML_NAMESPACE_DRAW,   XML_TRANSPARENCY,            
XML_ETACTION_STYLE_RENAME, XML_NAMESPACE_DRAW, XML_OPACITY, 
XML_FAMILY_TYPE_GRADIENT ),
+    ENTRY1(   XML_NAMESPACE_DRAW,   XML_MARKER,                  
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_MARKER ),
+    ENTRY1(   XML_NAMESPACE_DRAW,   XML_HATCH,                   
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_HATCH ),
+    ENTRY1(   XML_NAMESPACE_DRAW,   XML_STROKE_DASH,             
XML_ETACTION_STYLE,        XML_FAMILY_TYPE_STROKE_DASH ),
 
     // rename <text:h>'s text:level to text:outline-level
     // process <text:h/p>: process style-name attributes,
-    ENTRY1( TEXT, H, XML_ETACTION_PROC_ATTRS, OOO_PARA_ACTIONS ),
-    ENTRY1( TEXT, P, XML_ETACTION_PROC_ATTRS, OOO_PARA_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TEXT, XML_H, XML_ETACTION_PROC_ATTRS, 
OOO_PARA_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TEXT, XML_P, XML_ETACTION_PROC_ATTRS, 
OOO_PARA_ACTIONS ),
 
     // rename <text:ordered-list> and <text:unordered-list> to <text:list>
-    ENTRY2QN( TEXT, UNORDERED_LIST, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_TEXT, XML_LIST,
-                          OOO_STYLE_REF_ACTIONS ),
-    ENTRY2QN( TEXT, ORDERED_LIST, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                        XML_NAMESPACE_TEXT, XML_LIST,
-                          OOO_STYLE_REF_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_TEXT, XML_UNORDERED_LIST, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_TEXT, XML_LIST, 
OOO_STYLE_REF_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_TEXT, XML_ORDERED_LIST,   
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_TEXT, XML_LIST, 
OOO_STYLE_REF_ACTIONS ),
 
     // rename <text:footnote*> to <text:note*>
-    ENTRY3QQN( TEXT, FOOTNOTE, XML_ETACTION_RENAME_ELEM_ADD_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTE,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_FOOTNOTE ),
-    ENTRY1Q( TEXT, FOOTNOTE_BODY, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TEXT, XML_NOTE_BODY ),
-    ENTRY1Q( TEXT, FOOTNOTE_CITATION, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TEXT, XML_NOTE_CITATION ),
-    ENTRY3QQN( TEXT, FOOTNOTES_CONFIGURATION,
-                        XML_ETACTION_RENAME_ELEM_ADD_PROC_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTES_CONFIGURATION,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS,
-                        XML_FOOTNOTE | (OOO_STYLE_REF_ACTIONS << 16) ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_FOOTNOTE,                
XML_ETACTION_RENAME_ELEM_ADD_ATTR, XML_NAMESPACE_TEXT, XML_NOTE, 
XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_FOOTNOTE ),
+    ENTRY1Q(   XML_NAMESPACE_TEXT, XML_FOOTNOTE_BODY,           
XML_ETACTION_RENAME_ELEM, XML_NAMESPACE_TEXT, XML_NOTE_BODY ),
+    ENTRY1Q(   XML_NAMESPACE_TEXT, XML_FOOTNOTE_CITATION,       
XML_ETACTION_RENAME_ELEM, XML_NAMESPACE_TEXT, XML_NOTE_CITATION ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_FOOTNOTES_CONFIGURATION, 
XML_ETACTION_RENAME_ELEM_ADD_PROC_ATTR, XML_NAMESPACE_TEXT, 
XML_NOTES_CONFIGURATION, XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_FOOTNOTE | 
(OOO_STYLE_REF_ACTIONS << 16) ),
 
     // rename <text:endnote*> to <text:endnote*>
-    ENTRY3QQN( TEXT, ENDNOTE, XML_ETACTION_RENAME_ELEM_ADD_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTE,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_ENDNOTE ),
-    ENTRY1Q( TEXT, ENDNOTE_BODY, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TEXT, XML_NOTE_BODY ),
-    ENTRY1Q( TEXT, ENDNOTE_CITATION, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TEXT, XML_NOTE_CITATION ),
-    ENTRY3QQN( TEXT, ENDNOTES_CONFIGURATION,
-                        XML_ETACTION_RENAME_ELEM_ADD_PROC_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTES_CONFIGURATION,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS,
-                        XML_ENDNOTE | (OOO_STYLE_REF_ACTIONS << 16) ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_ENDNOTE,                
XML_ETACTION_RENAME_ELEM_ADD_ATTR,      XML_NAMESPACE_TEXT, XML_NOTE, 
XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_ENDNOTE ),
+    ENTRY1Q(   XML_NAMESPACE_TEXT, XML_ENDNOTE_BODY,           
XML_ETACTION_RENAME_ELEM,               XML_NAMESPACE_TEXT, XML_NOTE_BODY ),
+    ENTRY1Q(   XML_NAMESPACE_TEXT, XML_ENDNOTE_CITATION,       
XML_ETACTION_RENAME_ELEM,               XML_NAMESPACE_TEXT, XML_NOTE_CITATION ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_ENDNOTES_CONFIGURATION, 
XML_ETACTION_RENAME_ELEM_ADD_PROC_ATTR, XML_NAMESPACE_TEXT, 
XML_NOTES_CONFIGURATION, XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_ENDNOTE | 
(OOO_STYLE_REF_ACTIONS << 16) ),
 
     // rename <text:footnote> and <text:endnote> to <text:note>
-    ENTRY3QQN( TEXT, ENDNOTE_REF, XML_ETACTION_RENAME_ELEM_ADD_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTE_REF,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_ENDNOTE ),
-    ENTRY3QQN( TEXT, FOOTNOTE_REF, XML_ETACTION_RENAME_ELEM_ADD_ATTR,
-                        XML_NAMESPACE_TEXT, XML_NOTE_REF,
-                           XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_FOOTNOTE ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_ENDNOTE_REF,  
XML_ETACTION_RENAME_ELEM_ADD_ATTR, XML_NAMESPACE_TEXT, XML_NOTE_REF, 
XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_ENDNOTE ),
+    ENTRY3QQN( XML_NAMESPACE_TEXT, XML_FOOTNOTE_REF, 
XML_ETACTION_RENAME_ELEM_ADD_ATTR, XML_NAMESPACE_TEXT, XML_NOTE_REF, 
XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_FOOTNOTE ),
 
     // rename <text:tab-stop> to <text:tab>
-    ENTRY1Q( TEXT, TAB_STOP, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TEXT, XML_TAB ),
+    ENTRY1Q( XML_NAMESPACE_TEXT, XML_TAB_STOP, XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_TEXT, XML_TAB ),
 
     // replace <table:sub-table> with <table:table table:is-sub-table>
-    ENTRY3QQN( TABLE, SUB_TABLE, XML_ETACTION_RENAME_ELEM_ADD_ATTR,
-                        XML_NAMESPACE_TABLE, XML_TABLE,
-                           XML_NAMESPACE_TABLE, XML_IS_SUB_TABLE, XML_TRUE ),
+    ENTRY3QQN( XML_NAMESPACE_TABLE, XML_SUB_TABLE, 
XML_ETACTION_RENAME_ELEM_ADD_ATTR, XML_NAMESPACE_TABLE, XML_TABLE, 
XML_NAMESPACE_TABLE, XML_IS_SUB_TABLE, XML_TRUE ),
 
     // process *:style-name attributes
-    ENTRY1( TEXT, SECTION, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, SPAN, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, A, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, RUBY, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, RUBY_TEXT, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, DATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TIME, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, VARIABLE_GET, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, USER_FIELD_GET, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, USER_FIELD_INPUT, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, CREATION_DATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, CREATION_TIME, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, PRINT_TIME, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, PRINT_DATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, EDITING_DURATION, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, MODIFICATION_TIME, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, MODIFICATION_DATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, DATABASE_DISPLAY, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TABLE_FORMULA, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_TITLE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TABLE_OF_CONTENT, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TABLE_OF_CONTENT_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, ILLUSTRATION_INDEX, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, ILLUSTRATION_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TABLE_INDEX, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, TABLE_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, OBJECT_INDEX, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, OBJECT_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, USER_INDEX, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, USER_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, ALPHABETICAL_INDEX, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, ALPHABETICAL_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, BIBLIOGRAPHY, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, BIBLIOGRAPHY_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_SOURCE_STYLE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_TITLE_TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_CHAPTER, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY2QN( TEXT, INDEX_ENTRY_CHAPTER_NUMBER,
-            XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-            XML_NAMESPACE_TEXT, XML_INDEX_ENTRY_CHAPTER,
-            OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_TEXT, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_PAGE_NUMBER, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_SPAN, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_BIBLIOGRAPHY, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_LINK_START, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, INDEX_ENTRY_LINK_END, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( STYLE, HANDOUT_MASTER, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( DRAW, PAGE, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( STYLE, MAP, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( PRESENTATION, NOTES, XML_ETACTION_PROC_ATTRS,
-        OOO_STYLE_REF_ACTIONS ), /* generated entry */
-    ENTRY1( STYLE, PRESENTATION_PAGE_LAYOUT, XML_ETACTION_PROC_ATTRS,
-                        OOO_MASTER_PAGE_ACTIONS ),
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_SECTION,                         
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_SPAN,                            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_A,                               
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_RUBY,                            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_RUBY_TEXT,                       
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_DATE,                            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TIME,                            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_VARIABLE_GET,                    
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_USER_FIELD_GET,                  
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_USER_FIELD_INPUT,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_CREATION_DATE,                   
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_CREATION_TIME,                   
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_PRINT_TIME,                      
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_PRINT_DATE,                      
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_EDITING_DURATION,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_MODIFICATION_TIME,               
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_MODIFICATION_DATE,               
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_DATABASE_DISPLAY,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TABLE_FORMULA,                   
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_TITLE,                     
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TABLE_OF_CONTENT,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TABLE_OF_CONTENT_ENTRY_TEMPLATE, 
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_ILLUSTRATION_INDEX,              
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         
XML_ILLUSTRATION_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS, 
OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TABLE_INDEX,                     
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_TABLE_INDEX_ENTRY_TEMPLATE,      
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_OBJECT_INDEX,                    
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_OBJECT_INDEX_ENTRY_TEMPLATE,     
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_USER_INDEX,                      
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_USER_INDEX_ENTRY_TEMPLATE,       
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_ALPHABETICAL_INDEX,              
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         
XML_ALPHABETICAL_INDEX_ENTRY_TEMPLATE, XML_ETACTION_PROC_ATTRS, 
OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_BIBLIOGRAPHY,                    
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_BIBLIOGRAPHY_ENTRY_TEMPLATE,     
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_SOURCE_STYLE,              
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_TITLE_TEMPLATE,            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_CHAPTER,             
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY2QN( XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_CHAPTER_NUMBER,      
  XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_TEXT, 
XML_INDEX_ENTRY_CHAPTER, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_TEXT,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_PAGE_NUMBER,         
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_SPAN,                
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_BIBLIOGRAPHY,        
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_LINK_START,          
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_INDEX_ENTRY_LINK_END,            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_STYLE,        XML_HANDOUT_MASTER,                  
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_DRAW,         XML_PAGE,                            
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_STYLE,        XML_MAP,                             
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_PRESENTATION, XML_NOTES,                           
  XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_STYLE,        XML_PRESENTATION_PAGE_LAYOUT,        
  XML_ETACTION_PROC_ATTRS, OOO_MASTER_PAGE_ACTIONS ),
     /* Consider also attribute table:style-name for <table:table>,
        <table:table-row> and <table:table-column>. (#i40011#, #i40015#)
     */
-    ENTRY0( TABLE, TABLE, XML_ETACTION_TABLE ),
-    ENTRY1( TABLE, TABLE_ROW, XML_ETACTION_PROC_ATTRS, OOO_STYLE_REF_ACTIONS ),
-    ENTRY1( TABLE, TABLE_COLUMN, XML_ETACTION_PROC_ATTRS, 
OOO_STYLE_REF_ACTIONS ),
+    ENTRY0( XML_NAMESPACE_TABLE, XML_TABLE,        XML_ETACTION_TABLE ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_TABLE_ROW,    XML_ETACTION_PROC_ATTRS, 
OOO_STYLE_REF_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_ETACTION_PROC_ATTRS, 
OOO_STYLE_REF_ACTIONS ),
 
     // split frame elements
-    ENTRY0( DRAW, TEXT_BOX, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, IMAGE, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, OBJECT, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, OBJECT_OLE, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, APPLET, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, PLUGIN, XML_ETACTION_FRAME ),
-    ENTRY0( DRAW, FLOATING_FRAME, XML_ETACTION_FRAME ),
-    ENTRY0( SVG, DESC, XML_ETACTION_COPY_TEXT ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_TEXT_BOX,       XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_IMAGE,          XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_OBJECT,         XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_OBJECT_OLE,     XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_APPLET,         XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_PLUGIN,         XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_DRAW, XML_FLOATING_FRAME, XML_ETACTION_FRAME ),
+    ENTRY0( XML_NAMESPACE_SVG,  XML_DESC,           XML_ETACTION_COPY_TEXT ),
 
     // process events
-    ENTRY1Q( OFFICE, EVENTS, XML_ETACTION_RENAME_ELEM,
-                      XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ),
-    ENTRY0( SCRIPT, EVENT, XML_ETACTION_EVENT ),
-    ENTRY0( PRESENTATION, EVENT, XML_ETACTION_EVENT ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE,       XML_EVENTS, 
XML_ETACTION_RENAME_ELEM,XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ),
+    ENTRY0(  XML_NAMESPACE_SCRIPT,       XML_EVENT,  XML_ETACTION_EVENT ),
+    ENTRY0(  XML_NAMESPACE_PRESENTATION, XML_EVENT,  XML_ETACTION_EVENT ),
 
     // process length attributes
-    ENTRY1( DRAW, RECT, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, LINE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, POLYLINE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, POLYGON, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, PATH, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, CIRCLE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, ELLIPSE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, CONNECTOR, XML_ETACTION_PROC_ATTRS, OOO_CONNECTOR_ACTIONS ),
-    ENTRY1( DRAW, CAPTION, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, CONTROL, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, PAGE_THUMBNAIL, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, MEASURE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, G, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-//  ENTRY1( DRAW, TEXT_BOX, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( PRESENTATION, PLACEHOLDER, XML_ETACTION_PROC_ATTRS, 
OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, CONTOUR_POLYGON, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS 
),
-    ENTRY1( DRAW, CONTOUR_PATH, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, AREA_RECTANGLE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, AREA_CIRCLE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DRAW, AREA_POLYGON, XML_ETACTION_PROC_ATTRS, 
OOO_DRAW_AREA_POLYGON_ACTIONS ),
-    ENTRY1( DRAW, GLUE_POINT, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DR3D, SCENE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DR3D, CUBE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DR3D, SPHERE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DR3D, EXTRUDE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( DR3D, ROTATE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, TITLE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, SUBTITLE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, FOOTER, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, LEGEND, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, WALL, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, FLOOR, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, AXIS, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, GRID, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, SERIES, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, DATA_POINT, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, MEAN_VALUE, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, ERROR_INDICATOR, XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS 
),
-    ENTRY1( CHART, REGRESSION_CURVE, XML_ETACTION_PROC_ATTRS, 
OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, STOCK_GAIN_MARKER, XML_ETACTION_PROC_ATTRS, 
OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, STOCK_LOSS_MARKER, XML_ETACTION_PROC_ATTRS, 
OOO_SHAPE_ACTIONS ),
-    ENTRY1( CHART, STOCK_RANGE_LINE, XML_ETACTION_PROC_ATTRS, 
OOO_SHAPE_ACTIONS ),
-
-    ENTRY0( CHART, CHART, XML_ETACTION_CHART ),
-    ENTRY0( CHART, PLOT_AREA, XML_ETACTION_CHART_PLOT_AREA ),
-
-    ENTRY1Q( TEXT, TRACKED_CHANGES, XML_ETACTION_TRACKED_CHANGES,
-                        XML_NAMESPACE_TEXT, XML_PROTECTION_KEY ),
-    ENTRY1Q( TABLE, TRACKED_CHANGES, XML_ETACTION_TRACKED_CHANGES,
-                        XML_NAMESPACE_TABLE, XML_PROTECTION_KEY ),
-
-    ENTRY1( TEXT, INDEX_ENTRY_TAB_STOP, XML_ETACTION_PROC_ATTRS,
-                  OOO_INDEX_ENTRY_TAB_STOP_ACTIONS ),
-    ENTRY0( STYLE, TAB_STOP, XML_ETACTION_TAB_STOP ),
-    ENTRY1( STYLE, BACKGROUND_IMAGE, XML_ETACTION_PROC_ATTRS,
-                     OOO_BACKGROUND_IMAGE_ACTIONS  ),
-    ENTRY1( TEXT, LINENUMBERING_CONFIGURATION, XML_ETACTION_PROC_ATTRS,
-                  OOO_LINENUMBERING_ACTIONS ),
-    ENTRY1( STYLE, FOOTNOTE_SEP, XML_ETACTION_PROC_ATTRS,
-                   OOO_FOOTNOTE_SEP_ACTIONS ),
-    ENTRY1( STYLE, DROP_CAP, XML_ETACTION_PROC_ATTRS, OOO_DROP_CAP_ACTIONS ),
-    ENTRY1( STYLE, COLUMNS, XML_ETACTION_PROC_ATTRS, OOO_COLUMNS_ACTIONS ),
-    ENTRY1( STYLE, COLUMN, XML_ETACTION_PROC_ATTRS, OOO_COLUMNS_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_RECT,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_LINE,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_POLYLINE,          
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_POLYGON,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_PATH,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CIRCLE,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_ELLIPSE,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CONNECTOR,         
XML_ETACTION_PROC_ATTRS, OOO_CONNECTOR_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CAPTION,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CONTROL,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_PAGE_THUMBNAIL,    
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_MEASURE,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_G,                 
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+//  ENTRY1( XML_NAMESPACE_DRAW,         XML_TEXT_BOX,          
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER,       
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CONTOUR_POLYGON,   
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_CONTOUR_PATH,      
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_AREA_RECTANGLE,    
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_AREA_CIRCLE,       
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_AREA_POLYGON,      
XML_ETACTION_PROC_ATTRS, OOO_DRAW_AREA_POLYGON_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DRAW,         XML_GLUE_POINT,        
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DR3D,         XML_SCENE,             
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DR3D,         XML_CUBE,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DR3D,         XML_SPHERE,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DR3D,         XML_EXTRUDE,           
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_DR3D,         XML_ROTATE,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_TITLE,             
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_SUBTITLE,          
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_FOOTER,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_LEGEND,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_WALL,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_FLOOR,             
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_AXIS,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_GRID,              
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_SERIES,            
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_DATA_POINT,        
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_MEAN_VALUE,        
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_ERROR_INDICATOR,   
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_REGRESSION_CURVE,  
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_STOCK_GAIN_MARKER, 
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_STOCK_LOSS_MARKER, 
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_CHART,        XML_STOCK_RANGE_LINE,  
XML_ETACTION_PROC_ATTRS, OOO_SHAPE_ACTIONS ),
+
+    ENTRY0( XML_NAMESPACE_CHART, XML_CHART,     XML_ETACTION_CHART ),
+    ENTRY0( XML_NAMESPACE_CHART, XML_PLOT_AREA, XML_ETACTION_CHART_PLOT_AREA ),
+
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_TRACKED_CHANGES, 
XML_ETACTION_TRACKED_CHANGES, XML_NAMESPACE_TEXT,  XML_PROTECTION_KEY ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, 
XML_ETACTION_TRACKED_CHANGES, XML_NAMESPACE_TABLE, XML_PROTECTION_KEY ),
+
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_INDEX_ENTRY_TAB_STOP,        
XML_ETACTION_PROC_ATTRS, OOO_INDEX_ENTRY_TAB_STOP_ACTIONS ),
+    ENTRY0( XML_NAMESPACE_STYLE, XML_TAB_STOP,                    
XML_ETACTION_TAB_STOP ),
+    ENTRY1( XML_NAMESPACE_STYLE, XML_BACKGROUND_IMAGE,            
XML_ETACTION_PROC_ATTRS, OOO_BACKGROUND_IMAGE_ACTIONS  ),
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_LINENUMBERING_CONFIGURATION, 
XML_ETACTION_PROC_ATTRS, OOO_LINENUMBERING_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_STYLE, XML_FOOTNOTE_SEP,                
XML_ETACTION_PROC_ATTRS, OOO_FOOTNOTE_SEP_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_STYLE, XML_DROP_CAP,                    
XML_ETACTION_PROC_ATTRS, OOO_DROP_CAP_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_STYLE, XML_COLUMNS,                     
XML_ETACTION_PROC_ATTRS, OOO_COLUMNS_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_STYLE, XML_COLUMN,                      
XML_ETACTION_PROC_ATTRS, OOO_COLUMNS_ACTIONS ),
 
     // rename office:value-* to *:value-*
-    ENTRY1( TEXT, VARIABLE_DECL, XML_ETACTION_PROC_ATTRS,
-            OOO_TEXT_VALUE_TYPE_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, VARIABLE_SET, XML_ETACTION_PROC_ATTRS,
-            OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
-    ENTRY1( TEXT, VARIABLE_INPUT, XML_ETACTION_PROC_ATTRS,
-            OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
-    ENTRY1( TEXT, USER_FIELD_DECL, XML_ETACTION_PROC_ATTRS,
-            OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
-    ENTRY1( TEXT, EXPRESSION, XML_ETACTION_PROC_ATTRS,
-            OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
-//  ENTRY1( TEXT, USER_DEFINED, XML_ETACTION_PROC_ATTRS,
-//          OOO_TEXT_VALUE_TYPE_ACTIONS), /* text:user-defined has no attrs so 
far */
-    ENTRY1( TABLE, TABLE_CELL, XML_ETACTION_PROC_ATTRS,
-            OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
-    ENTRY1( TABLE, COVERED_TABLE_CELL, XML_ETACTION_PROC_ATTRS,
-            OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
-    ENTRY1( TABLE, CHANGE_TRACK_TABLE_CELL, XML_ETACTION_PROC_ATTRS,
-            OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
-//  ENTRY1( FORM, PROPERTY, XML_ETACTION_PROC_ATTRS,
-//          OOO_VALUE_TYPE_ACTIONS), /* TODO: generated entry */
-//  ENTRY1( FORM, LIST_PROPERTY, XML_ETACTION_PROC_ATTRS,
-//          OOO_VALUE_TYPE_ACTIONS), /* generated entry */
-
-    ENTRY1( OFFICE, ANNOTATION, XML_ETACTION_MOVE_ATTRS_TO_ELEMS,
-            OOO_ANNOTATION_ACTIONS ), /* generated entry */
-    ENTRY1( OFFICE, CHANGE_INFO, XML_ETACTION_MOVE_ATTRS_TO_ELEMS,
-            OOO_CHANGE_INFO_ACTIONS ), /* generated entry */
-
-    ENTRY1( TEXT, DDE_CONNECTION_DECL, XML_ETACTION_PROC_ATTRS,
-                     OOO_DDE_CONNECTION_DECL_ACTIONS  ),
-
-    ENTRY0( FORM, CONTROL, XML_ETACTION_FORM_CONTROL ),
-    ENTRY1( FORM, COLUMN, XML_ETACTION_PROC_ATTRS,
-                     OOO_FORM_COLUMN_ACTIONS  ),
-    ENTRY0( FORM, PROPERTY, XML_ETACTION_FORM_PROPERTY ),
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_VARIABLE_DECL,           
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_VARIABLE_SET,            
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_VARIABLE_INPUT,          
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_USER_FIELD_DECL,         
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT,  XML_EXPRESSION,              
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS), /* generated entry */
+//  ENTRY1( XML_NAMESPACE_TEXT,  XML_USER_DEFINED,            
XML_ETACTION_PROC_ATTRS, OOO_TEXT_VALUE_TYPE_ACTIONS), /* text:user-defined has 
no attrs so far */
+    ENTRY1( XML_NAMESPACE_TABLE, XML_TABLE_CELL,              
XML_ETACTION_PROC_ATTRS, OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL,      
XML_ETACTION_PROC_ATTRS, OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, 
XML_ETACTION_PROC_ATTRS, OOO_TABLE_VALUE_TYPE_ACTIONS), /* generated entry */
+//  ENTRY1( XML_NAMESPACE_FORM,  XML_PROPERTY,                
XML_ETACTION_PROC_ATTRS, OOO_VALUE_TYPE_ACTIONS), /* TODO: generated entry */
+//  ENTRY1( XML_NAMESPACE_FORM,  XML_LIST_PROPERTY,           
XML_ETACTION_PROC_ATTRS, OOO_VALUE_TYPE_ACTIONS), /* generated entry */
+
+    ENTRY1( XML_NAMESPACE_OFFICE, XML_ANNOTATION,  
XML_ETACTION_MOVE_ATTRS_TO_ELEMS, OOO_ANNOTATION_ACTIONS ), /* generated entry 
*/
+    ENTRY1( XML_NAMESPACE_OFFICE, XML_CHANGE_INFO, 
XML_ETACTION_MOVE_ATTRS_TO_ELEMS, OOO_CHANGE_INFO_ACTIONS ), /* generated entry 
*/
+
+    ENTRY1( XML_NAMESPACE_TEXT, XML_DDE_CONNECTION_DECL, 
XML_ETACTION_PROC_ATTRS, OOO_DDE_CONNECTION_DECL_ACTIONS  ),
+
+    ENTRY0( XML_NAMESPACE_FORM, XML_CONTROL,  XML_ETACTION_FORM_CONTROL ),
+    ENTRY1( XML_NAMESPACE_FORM, XML_COLUMN,   XML_ETACTION_PROC_ATTRS, 
OOO_FORM_COLUMN_ACTIONS ),
+    ENTRY0( XML_NAMESPACE_FORM, XML_PROPERTY, XML_ETACTION_FORM_PROPERTY ),
 
     // process xlink:href
-    ENTRY1( META, TEMPLATE, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( META, AUTO_RELOAD, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, SECTION_SOURCE, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, SCRIPT, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( TEXT, ALPHABETICAL_INDEX_AUTO_MARK_FILE, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( TABLE, TABLE_SOURCE, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( TABLE, CELL_RANGE_SOURCE, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( DRAW, A, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( PRESENTATION, SOUND, XML_ETACTION_PROC_ATTRS,
-        OOO_XLINK_ACTIONS ), /* generated entry */
-    ENTRY1( FORM, FORM, XML_ETACTION_PROC_ATTRS,
-        OOO_FORM_CONTROL_ACTIONS ),
-    ENTRY2QN( STYLE, SYMBOL_IMAGE, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-              XML_NAMESPACE_CHART, XML_SYMBOL_IMAGE,
-              OOO_BACKGROUND_IMAGE_ACTIONS ),
-
-    ENTRY2QN( CONFIG, CONFIG_ITEM_SET, XML_ETACTION_PROC_ATTRS_COND,
-        XML_NAMESPACE_OFFICE, XML_SETTINGS,
-        OOO_CONFIG_ITEM_SET_ACTIONS ),
+    ENTRY1(   XML_NAMESPACE_META,         XML_TEMPLATE,                        
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_META,         XML_AUTO_RELOAD,                     
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_SECTION_SOURCE,                  
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_TEXT,         XML_SCRIPT,                          
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_TEXT,         
XML_ALPHABETICAL_INDEX_AUTO_MARK_FILE, XML_ETACTION_PROC_ATTRS,             
OOO_XLINK_ACTIONS ), /* generated entry */
+    ENTRY1(   XML_NAMESPACE_TABLE,        XML_TABLE_SOURCE,                    
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_TABLE,        XML_CELL_RANGE_SOURCE,               
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_DRAW,         XML_A,                               
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_PRESENTATION, XML_SOUND,                           
  XML_ETACTION_PROC_ATTRS,             OOO_XLINK_ACTIONS ), /* generated entry 
*/
+    ENTRY1(   XML_NAMESPACE_FORM,         XML_FORM,                            
  XML_ETACTION_PROC_ATTRS,             OOO_FORM_CONTROL_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_STYLE,        XML_SYMBOL_IMAGE,                    
  XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_CHART, XML_SYMBOL_IMAGE, 
OOO_BACKGROUND_IMAGE_ACTIONS ),
+
+    ENTRY2QN( XML_NAMESPACE_CONFIG, XML_CONFIG_ITEM_SET, 
XML_ETACTION_PROC_ATTRS_COND, XML_NAMESPACE_OFFICE, XML_SETTINGS, 
OOO_CONFIG_ITEM_SET_ACTIONS ),
 
     // add namespace prefix
     //  text:formula
-    ENTRY1( TEXT, SEQUENCE, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT, XML_SEQUENCE, XML_ETACTION_PROC_ATTRS, 
OOO_FORMULA_ACTIONS ), /* generated entry */
     //  text:condition
-    ENTRY1( TEXT, DATABASE_NEXT, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT, XML_DATABASE_NEXT, XML_ETACTION_PROC_ATTRS, 
OOO_FORMULA_ACTIONS ), /* generated entry */
     //  text:condition
-    ENTRY2QN( TEXT, DATABASE_SELECT, XML_ETACTION_RENAME_ELEM_PROC_ATTRS,
-                XML_NAMESPACE_TEXT, XML_DATABASE_ROW_SELECT,
-        OOO_FORMULA_ACTIONS ),
+    ENTRY2QN( XML_NAMESPACE_TEXT, XML_DATABASE_SELECT, 
XML_ETACTION_RENAME_ELEM_PROC_ATTRS, XML_NAMESPACE_TEXT, 
XML_DATABASE_ROW_SELECT, OOO_FORMULA_ACTIONS ),
     //  text:condition
-    ENTRY1( TEXT, CONDITIONAL_TEXT, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT, XML_CONDITIONAL_TEXT, XML_ETACTION_PROC_ATTRS, 
OOO_FORMULA_ACTIONS ), /* generated entry */
     //  text:condition
-    ENTRY1( TEXT, HIDDEN_TEXT, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT, XML_HIDDEN_TEXT, XML_ETACTION_PROC_ATTRS, 
OOO_FORMULA_ACTIONS ), /* generated entry */
     //  text:condition
-    ENTRY1( TEXT, HIDDEN_PARAGRAPH, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TEXT, XML_HIDDEN_PARAGRAPH, XML_ETACTION_PROC_ATTRS, 
OOO_FORMULA_ACTIONS ), /* generated entry */
     //  table:condition
-    ENTRY1( TABLE, CONTENT_VALIDATION, XML_ETACTION_PROC_ATTRS,
-        OOO_FORMULA_ACTIONS ), /* generated entry */
+    ENTRY1( XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, 
XML_ETACTION_PROC_ATTRS, OOO_FORMULA_ACTIONS ), /* generated entry */
 
     // rename <table:dependences> to <table:dependencies>
-    ENTRY1Q( TABLE, DEPENDENCES, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TABLE, XML_DEPENDENCIES ),
-    ENTRY1Q( TABLE, DEPENDENCE, XML_ETACTION_RENAME_ELEM,
-                        XML_NAMESPACE_TABLE, XML_DEPENDENCY ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_DEPENDENCES, XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_TABLE, XML_DEPENDENCIES ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_DEPENDENCE,  XML_ETACTION_RENAME_ELEM, 
XML_NAMESPACE_TABLE, XML_DEPENDENCY ),
 
     // process table::error-macro
-    ENTRY1( TABLE, ERROR_MACRO, XML_ETACTION_PROC_ATTRS,
-            OOO_ERROR_MACRO_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_ERROR_MACRO, XML_ETACTION_PROC_ATTRS, 
OOO_ERROR_MACRO_ACTIONS ),
 
     // process table::conversion-mode
-    ENTRY1( TABLE, CONVERSION_MODE, XML_ETACTION_PROC_ATTRS,
-            OOO_DDE_CONV_MODE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_CONVERSION_MODE, XML_ETACTION_PROC_ATTRS, 
OOO_DDE_CONV_MODE_ACTIONS ),
 
     // fix <text:alphabatical-index-mark text:main-etry>
-    ENTRY1( TEXT, ALPHABETICAL_INDEX_MARK, XML_ETACTION_PROC_ATTRS,
-            OOO_ALPHABETICAL_INDEX_MARK_ACTIONS ),
-    ENTRY1( TEXT, ALPHABETICAL_INDEX_MARK_START, XML_ETACTION_PROC_ATTRS,
-            OOO_ALPHABETICAL_INDEX_MARK_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_MARK,       
XML_ETACTION_PROC_ATTRS, OOO_ALPHABETICAL_INDEX_MARK_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TEXT, XML_ALPHABETICAL_INDEX_MARK_START, 
XML_ETACTION_PROC_ATTRS, OOO_ALPHABETICAL_INDEX_MARK_ACTIONS ),
 
     // process table::data-pilot-member
-    ENTRY1( TABLE, DATA_PILOT_MEMBER, XML_ETACTION_PROC_ATTRS,
-            OOO_DATAPILOT_MEMBER_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, 
XML_ETACTION_PROC_ATTRS, OOO_DATAPILOT_MEMBER_ACTIONS ),
 
     // process table::data-pilot-level
-    ENTRY1( TABLE, DATA_PILOT_LEVEL, XML_ETACTION_PROC_ATTRS,
-            OOO_DATAPILOT_LEVEL_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, 
XML_ETACTION_PROC_ATTRS, OOO_DATAPILOT_LEVEL_ACTIONS ),
 
     // process table::source-service
-    ENTRY1( TABLE, SOURCE_SERVICE, XML_ETACTION_PROC_ATTRS,
-            OOO_SOURCE_SERVICE_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_ETACTION_PROC_ATTRS, 
OOO_SOURCE_SERVICE_ACTIONS ),
 
     // fix id strings in old animation elements
-    ENTRY1( PRESENTATION, DIM, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS 
),
-    ENTRY1( PRESENTATION, PLAY, XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS 
),
-    ENTRY1( PRESENTATION, SHOW_TEXT, XML_ETACTION_PROC_ATTRS, 
OOO_ANIMATION_ACTIONS ),
-    ENTRY1( PRESENTATION, SHOW_SHAPE, XML_ETACTION_PROC_ATTRS, 
OOO_ANIMATION_ACTIONS ),
-    ENTRY1( PRESENTATION, HIDE_TEXT, XML_ETACTION_PROC_ATTRS, 
OOO_ANIMATION_ACTIONS ),
-    ENTRY1( PRESENTATION, HIDE_SHAPE, XML_ETACTION_PROC_ATTRS, 
OOO_ANIMATION_ACTIONS ),
-
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ETACTION_EOT )
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_DIM,        
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_PLAY,       
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_SHOW_TEXT,  
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_SHOW_SHAPE, 
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_HIDE_TEXT,  
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+    ENTRY1( XML_NAMESPACE_PRESENTATION, XML_HIDE_SHAPE, 
XML_ETACTION_PROC_ATTRS, OOO_ANIMATION_ACTIONS ),
+
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ETACTION_EOT )
 };
 
 // XML_ETACTION_STYLE
 XMLTransformerActionInit const aStyleActionTable[] =
 {
-    ENTRY0( STYLE, FAMILY, XML_ATACTION_STYLE_FAMILY ),
-    ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ),
-    ENTRY0( STYLE, PARENT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, NEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, LIST_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, MASTER_PAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, DATA_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, NAME, XML_ATACTION_ENCODE_STYLE_NAME ),
-    ENTRY0( DRAW, DISTANCE, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, DOTS1_LENGTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, DOTS2_LENGTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, WIDTH, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( SVG, HEIGHT, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( DRAW, START, XML_ATACTION_NEG_PERCENT ),
-    ENTRY0( DRAW, END, XML_ATACTION_NEG_PERCENT ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_FAMILY,            
XML_ATACTION_STYLE_FAMILY ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_PARENT_STYLE_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_NEXT_STYLE_NAME,   
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_LIST_STYLE_NAME,   
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_MASTER_PAGE_NAME,  
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_DATA_STYLE_NAME,   
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_DISTANCE,          XML_ATACTION_INCH2IN 
),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_DOTS1_LENGTH,      XML_ATACTION_INCH2IN 
),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_DOTS2_LENGTH,      XML_ATACTION_INCH2IN 
),
+    ENTRY0( XML_NAMESPACE_SVG,    XML_WIDTH,             
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0( XML_NAMESPACE_SVG,    XML_HEIGHT,            
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_START,             
XML_ATACTION_NEG_PERCENT ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_END,               
XML_ATACTION_NEG_PERCENT ),
+    ENTRY1( XML_NAMESPACE_XLINK,  XML_HREF,              XML_ATACTION_URI_OOO, 
sal_uInt32(true) ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,     XML_ATACTION_EOT )
 };
 
 // OOO_FRAME_ELEM_ACTIONS
 XMLTransformerActionInit const aFrameElemActionTable[] =
 {
-    ENTRY1Q( OFFICE, EVENTS, XML_ETACTION_RENAME_ELEM,
-                      XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ),
-    ENTRY0( DRAW, GLUE_POINT, XML_ETACTION_COPY ),
-    ENTRY0( DRAW, IMAGE_MAP, XML_ETACTION_COPY ),
-    ENTRY0( SVG, DESC, XML_ETACTION_COPY_TEXT ),
-    ENTRY0( DRAW, CONTOUR_POLYGON, XML_ETACTION_COPY ),
-    ENTRY0( DRAW, CONTOUR_PATH, XML_ETACTION_COPY ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ETACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_EVENTS,          
XML_ETACTION_RENAME_ELEM, XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS ),
+    ENTRY0(  XML_NAMESPACE_DRAW,   XML_GLUE_POINT,      XML_ETACTION_COPY ),
+    ENTRY0(  XML_NAMESPACE_DRAW,   XML_IMAGE_MAP,       XML_ETACTION_COPY ),
+    ENTRY0(  XML_NAMESPACE_SVG,    XML_DESC,            XML_ETACTION_COPY_TEXT 
),
+    ENTRY0(  XML_NAMESPACE_DRAW,   XML_CONTOUR_POLYGON, XML_ETACTION_COPY ),
+    ENTRY0(  XML_NAMESPACE_DRAW,   XML_CONTOUR_PATH,    XML_ETACTION_COPY ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,   XML_ETACTION_EOT )
 };
 
 // OOO_FRAME_ATTR_ACTIONS
 XMLTransformerActionInit const aFrameAttrActionTable[] =
 {
-    ENTRY0( DRAW, ZINDEX, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( DRAW, ID, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( DRAW, LAYER, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( DRAW, STYLE_NAME, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry 
*/
-    ENTRY0( PRESENTATION, STYLE_NAME, XML_ATACTION_MOVE_TO_ELEM ), /* 
generated entry */
-    ENTRY0( DRAW, TRANSFORM, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( DRAW, NAME, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( TABLE, END_CELL_ADDRESS, XML_ATACTION_MOVE_TO_ELEM ), /* generated 
entry */
-    ENTRY0( TABLE, END_X, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( TABLE, END_Y, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( TABLE, TABLE_BACKGROUND, XML_ATACTION_MOVE_TO_ELEM ), /* generated 
entry */
-    ENTRY0( TEXT, ANCHOR_TYPE, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry 
*/
-    ENTRY0( TEXT, ANCHOR_PAGE_NUMBER, XML_ATACTION_MOVE_TO_ELEM ), /* 
generated entry */
-    ENTRY0( DRAW, TEXT_STYLE_NAME, XML_ATACTION_MOVE_TO_ELEM ), /* generated 
entry */
-    ENTRY0( SVG, X, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( SVG, Y, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( SVG, WIDTH, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( SVG, HEIGHT, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
-    ENTRY0( STYLE, REL_WIDTH, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry 
*/
-    ENTRY0( STYLE, REL_HEIGHT, XML_ATACTION_MOVE_TO_ELEM ), /* generated entry 
*/
-    ENTRY0( PRESENTATION, CLASS, XML_ATACTION_MOVE_TO_ELEM ), /* generated 
entry */
-    ENTRY0( PRESENTATION, PLACEHOLDER, XML_ATACTION_MOVE_TO_ELEM ), /* 
generated entry */
-    ENTRY0( PRESENTATION, USER_TRANSFORMED, XML_ATACTION_MOVE_TO_ELEM ), /* 
generated entry */
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_ZINDEX,             
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_ID,                 
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_LAYER,              
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_STYLE_NAME,         
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME,         
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_TRANSFORM,          
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_NAME,               
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_END_CELL_ADDRESS,   
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_END_X,              
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_END_Y,              
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_TABLE_BACKGROUND,   
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_ANCHOR_TYPE,        
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_ANCHOR_PAGE_NUMBER, 
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_TEXT_STYLE_NAME,    
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_SVG,          XML_X,                  
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_SVG,          XML_Y,                  
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_SVG,          XML_WIDTH,              
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_SVG,          XML_HEIGHT,             
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_STYLE,        XML_REL_WIDTH,          
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_STYLE,        XML_REL_HEIGHT,         
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_PRESENTATION, XML_CLASS,              
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER,        
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED,   
XML_ATACTION_MOVE_TO_ELEM ), /* generated entry */
+    ENTRY0( XML_NAMESPACE_OFFICE,       XML_TOKEN_INVALID,      
XML_ATACTION_EOT )
 };
 
 // OOO_EVENT_ELEM_ACTIONS
 XMLTransformerActionInit const aEventActionTable[] =
 {
-    ENTRY0( XLINK, HREF, XML_ATACTION_HREF ),
-    ENTRY1( SCRIPT, LANGUAGE, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                    XML_NAMESPACE_OOO ),
-    ENTRY0( SCRIPT, EVENT_NAME, XML_ATACTION_EVENT_NAME ),
-    ENTRY0( SCRIPT, MACRO_NAME, XML_ATACTION_MACRO_NAME ),
-    ENTRY0( SCRIPT, LOCATION, XML_ATACTION_MACRO_LOCATION ),
-    ENTRY0( SCRIPT, LIBRARY, XML_ATACTION_MACRO_LOCATION ), // bug in draw
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_XLINK,  XML_HREF,          XML_ATACTION_HREF ),
+    ENTRY1( XML_NAMESPACE_SCRIPT, XML_LANGUAGE,      
XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ),
+    ENTRY0( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME,    XML_ATACTION_EVENT_NAME ),
+    ENTRY0( XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,    XML_ATACTION_MACRO_NAME ),
+    ENTRY0( XML_NAMESPACE_SCRIPT, XML_LOCATION,      
XML_ATACTION_MACRO_LOCATION ),
+    ENTRY0( XML_NAMESPACE_SCRIPT, XML_LIBRARY,       
XML_ATACTION_MACRO_LOCATION ), // bug in draw
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // action table for OOO_MASTER_PAGE_ACTIONS
 XMLTransformerActionInit const aMasterPageActionTable[] =
 {
-    ENTRY0( STYLE, NAME, XML_ATACTION_ENCODE_STYLE_NAME ),
-    ENTRY0( STYLE, NEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1Q( STYLE, PAGE_MASTER_NAME, 
XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF,
-                        XML_NAMESPACE_STYLE, XML_PAGE_LAYOUT_NAME ),
-    ENTRY0( DRAW, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_STYLE,  XML_NAME,             
XML_ATACTION_ENCODE_STYLE_NAME ),
+    ENTRY0(  XML_NAMESPACE_STYLE,  XML_NEXT_STYLE_NAME,  
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1Q( XML_NAMESPACE_STYLE,  XML_PAGE_MASTER_NAME, 
XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF, XML_NAMESPACE_STYLE, 
XML_PAGE_LAYOUT_NAME ),
+    ENTRY0(  XML_NAMESPACE_DRAW,   XML_STYLE_NAME,       
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,    XML_ATACTION_EOT )
 };
 
 XMLTransformerActionInit const aFontDeclActionTable[] =
 {
-    ENTRY1Q( FO, FONT_FAMILY, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_SVG, XML_FONT_FAMILY ),
-    ENTRY1Q( STYLE, FONT_STYLE_NAME, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_STYLE, XML_FONT_ADORNMENTS ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_FO,     XML_FONT_FAMILY,     XML_ATACTION_RENAME, 
XML_NAMESPACE_SVG,   XML_FONT_FAMILY ),
+    ENTRY1Q( XML_NAMESPACE_STYLE,  XML_FONT_STYLE_NAME, XML_ATACTION_RENAME, 
XML_NAMESPACE_STYLE, XML_FONT_ADORNMENTS ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 // action table for OOO_PARA_ACTIONS
 XMLTransformerActionInit const aParaActionTable[] =
 {
-    ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, COND_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-//  ENTRY0( TEXT, CLASS_NAMES, XML_ATACTION_REMOVE ),
-    ENTRY1Q( TEXT, LEVEL, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_TEXT,   XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_TEXT,   XML_COND_STYLE_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+//  ENTRY0(  XML_NAMESPACE_TEXT,   XML_CLASS_NAMES,     XML_ATACTION_REMOVE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,   XML_LEVEL,           XML_ATACTION_RENAME, 
XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 // action table for OOO_STYLE_REF_ACTIONS
 XMLTransformerActionInit const aStyleRefActionTable[] =
 {
-    ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, VISITED_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, MAIN_ENTRY_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, CITATION_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, CITATION_BODY_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF 
),
-    ENTRY0( TEXT, DEFAULT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TEXT, MASTER_PAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, DATA_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, APPLY_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( STYLE, PAGE_LAYOUT_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TABLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( TABLE, DEFAULT_CELL_STYLE_NAME,
-            XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, MASTER_PAGE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( PRESENTATION, PRESENTATION_PAGE_LAYOUT_NAME,
-            XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
-    ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY1( TEXT, FORMULA, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_STYLE_NAME,                    
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_VISITED_STYLE_NAME,            
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_MAIN_ENTRY_STYLE_NAME,         
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_CITATION_STYLE_NAME,           
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_CITATION_BODY_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_DEFAULT_STYLE_NAME,            
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TEXT,         XML_MASTER_PAGE_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,        XML_DATA_STYLE_NAME,               
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,        XML_APPLY_STYLE_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_STYLE,        XML_PAGE_LAYOUT_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_STYLE_NAME,                    
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_TABLE,        XML_DEFAULT_CELL_STYLE_NAME,       
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_STYLE_NAME,                    
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_DRAW,         XML_MASTER_PAGE_NAME,              
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_PRESENTATION, XML_PRESENTATION_PAGE_LAYOUT_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1( XML_NAMESPACE_XLINK,        XML_HREF,                          
XML_ATACTION_URI_OOO,              sal_uInt32(false) ),
+    ENTRY1( XML_NAMESPACE_TEXT,         XML_CONDITION,                     
XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY1( XML_NAMESPACE_TEXT,         XML_FORMULA,                       
XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY0( XML_NAMESPACE_OFFICE,       XML_TOKEN_INVALID,                 
XML_ATACTION_EOT )
 };
 
 // OOO_SHAPE_ACTIONS
@@ -718,206 +552,175 @@ XMLTransformerActionInit const aStyleRefActionTable[] =
 // aConnectorActionTable if appropriate
 XMLTransformerActionInit const aShapeActionTable[] =
 {
-    ENTRY0( SVG, X, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, Y, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, X1, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, Y1, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, X2, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, Y2, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, CX, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, CY, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, R, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, RX, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, RY, XML_ATACTION_INCH2IN ),
-    ENTRY0( SVG, WIDTH, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( SVG, HEIGHT, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( FO, MIN_WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MIN_HEIGHT, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MAX_WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MAX_HEIGHT, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, CORNER_RADIUS, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, LINE_SKEW, XML_ATACTION_INCHS2INS ),
-    ENTRY0( DRAW, CAPTION_POINT_X, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, CAPTION_POINT_Y, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, TEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, END_X, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, END_Y, XML_ATACTION_INCH2IN ),
-    ENTRY0( PRESENTATION, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DR3D, DISTANCE, XML_ATACTION_INCH2IN ),
-    ENTRY0( DR3D, FOCAL_LENGTH, XML_ATACTION_INCH2IN ),
-    ENTRY1Q( FORM, ID, XML_ATACTION_RENAME,
-                    XML_NAMESPACE_DRAW, XML_CONTROL ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_X,               
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_Y,               
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_X1,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_Y1,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_X2,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_Y2,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_CX,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_CY,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_R,               
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_RX,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_RY,              
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_WIDTH,           
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_HEIGHT,          
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MIN_WIDTH,       
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MIN_HEIGHT,      
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MAX_WIDTH,       
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MAX_HEIGHT,      
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_CORNER_RADIUS,   
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_LINE_SKEW,       
XML_ATACTION_INCHS2INS ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_CAPTION_POINT_X, 
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_CAPTION_POINT_Y, 
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_TEXT_STYLE_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_END_X,           
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_END_Y,           
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_DR3D,         XML_DISTANCE,        
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DR3D,         XML_FOCAL_LENGTH,    
XML_ATACTION_INCH2IN ),
+    ENTRY1Q( XML_NAMESPACE_FORM,         XML_ID,              
XML_ATACTION_RENAME,  XML_NAMESPACE_DRAW, XML_CONTROL ),
+    ENTRY1(  XML_NAMESPACE_XLINK,        XML_HREF,            
XML_ATACTION_URI_OOO, sal_uInt32(true) ),
 
     // BM: needed by chart:legend.  The legend needs also the draw actions.  As
     // there is no merge mechanism, all actions have to be in the same table
-    ENTRY2( CHART, LEGEND_POSITION, XML_ATACTION_RENAME_ATTRIBUTE,
-            RENAME_ENTRY( XML_LEFT, XML_START ),
-            RENAME_ENTRY( XML_RIGHT, XML_END )),
-    ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ),
-    ENTRY0( DRAW, START_SHAPE, XML_ATACTION_SHAPEID ),
-    ENTRY0( DRAW, END_SHAPE, XML_ATACTION_SHAPEID ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY2( XML_NAMESPACE_CHART,  XML_LEGEND_POSITION, 
XML_ATACTION_RENAME_ATTRIBUTE, RENAME_ENTRY( XML_LEFT, XML_START ), 
RENAME_ENTRY( XML_RIGHT, XML_END )),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_ID,              XML_ATACTION_SHAPEID ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_START_SHAPE,     XML_ATACTION_SHAPEID ),
+    ENTRY0( XML_NAMESPACE_DRAW,   XML_END_SHAPE,       XML_ATACTION_SHAPEID ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 XMLTransformerActionInit const aConnectorActionTable[] =
 {
-    ENTRY0( SVG, X1, XML_ATACTION_TWIPS2IN ),
-    ENTRY0( SVG, Y1, XML_ATACTION_TWIPS2IN ),
-    ENTRY0( SVG, X2, XML_ATACTION_TWIPS2IN ),
-    ENTRY0( SVG, Y2, XML_ATACTION_TWIPS2IN ),
-    ENTRY0( SVG, WIDTH, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( SVG, HEIGHT, XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
-    ENTRY0( FO, MIN_WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MIN_HEIGHT, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MAX_WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( FO, MAX_HEIGHT, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, TEXT_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( DRAW, END_X, XML_ATACTION_INCH2IN ),
-    ENTRY0( DRAW, END_Y, XML_ATACTION_INCH2IN ),
-    ENTRY0( PRESENTATION, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1Q( FORM, ID, XML_ATACTION_RENAME,
-                    XML_NAMESPACE_DRAW, XML_CONTROL ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
-    ENTRY0( DRAW, ID, XML_ATACTION_SHAPEID ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_X1,              
XML_ATACTION_TWIPS2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_Y1,              
XML_ATACTION_TWIPS2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_X2,              
XML_ATACTION_TWIPS2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_Y2,              
XML_ATACTION_TWIPS2IN ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_WIDTH,           
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0(  XML_NAMESPACE_SVG,          XML_HEIGHT,          
XML_ATACTION_SVG_WIDTH_HEIGHT_OOO ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MIN_WIDTH,       
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MIN_HEIGHT,      
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MAX_WIDTH,       
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_FO,           XML_MAX_HEIGHT,      
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_TEXT_STYLE_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_END_X,           
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_END_Y,           
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_PRESENTATION, XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1Q( XML_NAMESPACE_FORM,         XML_ID,              
XML_ATACTION_RENAME,  XML_NAMESPACE_DRAW, XML_CONTROL ),
+    ENTRY1(  XML_NAMESPACE_XLINK,        XML_HREF,            
XML_ATACTION_URI_OOO, sal_uInt32(true) ),
+    ENTRY0(  XML_NAMESPACE_DRAW,         XML_ID,              
XML_ATACTION_SHAPEID ),
+    ENTRY0(  XML_NAMESPACE_OFFICE,       XML_TOKEN_INVALID,   XML_ATACTION_EOT 
)
 };
 
 // OOO_INDEX_ENTRY_TAB_STOP_ACTIONS
 XMLTransformerActionInit const aIndexEntryTabStopActionTable[] =
 {
-    ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ),
-    ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_POSITION,      XML_ATACTION_INCH2IN ),
+    ENTRY0( XML_NAMESPACE_TEXT,   XML_STYLE_NAME,    
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_TAB_STOP_ACTIONS
 XMLTransformerActionInit const aTabStopActionTable[] =
 {
-    ENTRY0( STYLE, POSITION, XML_ATACTION_INCH2IN ),
-    ENTRY1Q( STYLE, LEADER_CHAR, XML_ATACTION_RENAME,
-                    XML_NAMESPACE_STYLE, XML_LEADER_TEXT ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_STYLE,  XML_POSITION,      XML_ATACTION_INCH2IN ),
+    ENTRY1Q( XML_NAMESPACE_STYLE,  XML_LEADER_CHAR,   XML_ATACTION_RENAME, 
XML_NAMESPACE_STYLE, XML_LEADER_TEXT ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_LINENUMBERING_ACTIONS
 XMLTransformerActionInit const aLineNumberingActionTable[] =
 {
-    ENTRY0( TEXT, OFFSET, XML_ATACTION_INCH2IN ),
-    ENTRY0( TEXT, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1Q( TEXT, COUNT_IN_FLOATING_FRAMES, XML_ATACTION_RENAME,
-                    XML_NAMESPACE_TEXT, XML_COUNT_IN_TEXT_BOXES ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_TEXT,   XML_OFFSET,                   
XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_TEXT,   XML_STYLE_NAME,               
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,   XML_COUNT_IN_FLOATING_FRAMES, 
XML_ATACTION_RENAME, XML_NAMESPACE_TEXT, XML_COUNT_IN_TEXT_BOXES ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,            
XML_ATACTION_EOT )
 };
 
 XMLTransformerActionInit const aFootnoteSepActionTable[] =
 {
-    ENTRY0( STYLE, WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( STYLE, DISTANCE_BEFORE_SEP, XML_ATACTION_INCH2IN ),
-    ENTRY0( STYLE, DISTANCE_AFTER_SEP, XML_ATACTION_INCH2IN ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_WIDTH,               
XML_ATACTION_INCH2IN ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_DISTANCE_BEFORE_SEP, 
XML_ATACTION_INCH2IN ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_DISTANCE_AFTER_SEP,  
XML_ATACTION_INCH2IN ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,       XML_ATACTION_EOT )
 };
 
 // OOO_DROP_CAP_ACTIONS
 XMLTransformerActionInit const aDropCapActionTable[] =
 {
-    ENTRY0( STYLE, DISTANCE, XML_ATACTION_INCH2IN ),
-    ENTRY0( STYLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_DISTANCE,      XML_ATACTION_INCH2IN ),
+    ENTRY0( XML_NAMESPACE_STYLE,  XML_STYLE_NAME,    
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 XMLTransformerActionInit const aColumnsActionTable[] =
 {
-    ENTRY0( STYLE, COLUMN_GAP, XML_ATACTION_INCH2IN ),
-//  ENTRY0( STYLE, SPACE_BEFORE, XML_ATACTION_INCH2IN ),
-//  ENTRY0( STYLE, SPACE_AFTER, XML_ATACTION_INCH2IN ),
-    ENTRY1Q( FO, MARGIN_LEFT, XML_ATACTION_RENAME_INCH2IN,
-           XML_NAMESPACE_FO, XML_START_INDENT ),
-    ENTRY1Q( FO, MARGIN_RIGHT, XML_ATACTION_RENAME_INCH2IN,
-           XML_NAMESPACE_FO, XML_END_INDENT ),
-    ENTRY0( STYLE, WIDTH, XML_ATACTION_INCH2IN ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0(  XML_NAMESPACE_STYLE,  XML_COLUMN_GAP,    XML_ATACTION_INCH2IN ),
+//  ENTRY0(  XML_NAMESPACE_STYLE,  XML_SPACE_BEFORE,  XML_ATACTION_INCH2IN ),
+//  ENTRY0(  XML_NAMESPACE_STYLE,  XML_SPACE_AFTER,   XML_ATACTION_INCH2IN ),
+    ENTRY1Q( XML_NAMESPACE_FO,     XML_MARGIN_LEFT,   
XML_ATACTION_RENAME_INCH2IN, XML_NAMESPACE_FO, XML_START_INDENT ),
+    ENTRY1Q( XML_NAMESPACE_FO,     XML_MARGIN_RIGHT,  
XML_ATACTION_RENAME_INCH2IN, XML_NAMESPACE_FO, XML_END_INDENT ),
+    ENTRY0(  XML_NAMESPACE_STYLE,  XML_WIDTH,         XML_ATACTION_INCH2IN ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_TEXT_VALUE_TYPE_ACTIONS
 XMLTransformerActionInit const aTextValueTypeActionTable[] =
 {
-    ENTRY1Q( TEXT, VALUE_TYPE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
-    ENTRY1Q( TEXT, VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_VALUE ),
-    ENTRY1Q( TEXT, CURRENCY, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_CURRENCY ),
-    ENTRY1Q( TEXT, DATE_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_DATE_VALUE ),
-    ENTRY1Q( TEXT, TIME_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_TIME_VALUE ),
-    ENTRY1Q( TEXT, BOOLEAN_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE ),
-    ENTRY1Q( TEXT, STRING_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_STRING_VALUE ),
-    ENTRY0( STYLE, DATA_STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1( TEXT, FORMULA, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY0( TEXT, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_VALUE_TYPE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_VALUE,           XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_CURRENCY,        XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_CURRENCY ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_DATE_VALUE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_DATE_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_TIME_VALUE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_TIME_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_BOOLEAN_VALUE,   XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TEXT,  XML_STRING_VALUE,    XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_STRING_VALUE ),
+    ENTRY0(  XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, 
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1(  XML_NAMESPACE_TEXT,  XML_FORMULA,         
XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY0(  XML_NAMESPACE_TEXT,  XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 // OOO_TABLE_VALUE_TYPE_ACTIONS
 XMLTransformerActionInit const aTableValueTypeActionTable[] =
 {
-    ENTRY1Q( TABLE, VALUE_TYPE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
-    ENTRY1Q( TABLE, VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_VALUE ),
-    ENTRY1Q( TABLE, CURRENCY, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_CURRENCY ),
-    ENTRY1Q( TABLE, DATE_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_DATE_VALUE ),
-    ENTRY1Q( TABLE, TIME_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_TIME_VALUE ),
-    ENTRY1Q( TABLE, BOOLEAN_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE ),
-    ENTRY1Q( TABLE, STRING_VALUE, XML_ATACTION_RENAME,
-           XML_NAMESPACE_OFFICE, XML_STRING_VALUE ),
-    ENTRY0( TABLE, STYLE_NAME, XML_ATACTION_ENCODE_STYLE_NAME_REF ),
-    ENTRY1( TABLE, FORMULA, XML_ATACTION_ADD_APP_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY1Q( TABLE, VALIDATION_NAME, XML_ATACTION_RENAME,
-           XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME ),
-    ENTRY0( TABLE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_VALUE_TYPE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_VALUE,           XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_CURRENCY,        XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_CURRENCY ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_DATE_VALUE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_DATE_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_TIME_VALUE,      XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_TIME_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_BOOLEAN_VALUE,   XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_BOOLEAN_VALUE ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_STRING_VALUE,    XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_STRING_VALUE ),
+    ENTRY0(  XML_NAMESPACE_TABLE, XML_STYLE_NAME,      
XML_ATACTION_ENCODE_STYLE_NAME_REF ),
+    ENTRY1(  XML_NAMESPACE_TABLE, XML_FORMULA,         
XML_ATACTION_ADD_APP_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY1Q( XML_NAMESPACE_TABLE, XML_VALIDATION_NAME, XML_ATACTION_RENAME, 
XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION_NAME ),
+    ENTRY0(  XML_NAMESPACE_TABLE, XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 // action table for OOO_ANNOTATION_ACTIONS
 XMLTransformerActionInit const aAnnotationActionTable[] =
 {
-    ENTRY1Q( OFFICE, AUTHOR, XML_ATACTION_MOVE_TO_ELEM,
-                XML_NAMESPACE_DC, XML_CREATOR ),
-    ENTRY1Q( OFFICE, CREATE_DATE, XML_ATACTION_MOVE_TO_ELEM,
-                XML_NAMESPACE_DC, XML_DATE ),
-    ENTRY1Q( OFFICE, CREATE_DATE_STRING, XML_ATACTION_MOVE_TO_ELEM,
-                XML_NAMESPACE_META, XML_DATE_STRING ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_AUTHOR,             
XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC,   XML_CREATOR ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_CREATE_DATE,        
XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC,   XML_DATE ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, 
XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_META, XML_DATE_STRING ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,      XML_ATACTION_EOT )
 };
 
 // action table for OOO_CHANGE_INFO_ACTIONS
 XMLTransformerActionInit const aChangeInfoActionTable[] =
 {
-    ENTRY1Q( OFFICE, CHG_AUTHOR, XML_ATACTION_MOVE_TO_ELEM,
-                XML_NAMESPACE_DC, XML_CREATOR ),
-    ENTRY1Q( OFFICE, CHG_DATE_TIME, XML_ATACTION_MOVE_TO_ELEM,
-                XML_NAMESPACE_DC, XML_DATE ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_CHG_AUTHOR,    
XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_CREATOR ),
+    ENTRY1Q( XML_NAMESPACE_OFFICE, XML_CHG_DATE_TIME, 
XML_ATACTION_MOVE_TO_ELEM, XML_NAMESPACE_DC, XML_DATE ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_BACKGROUND_IMAGE_ACTIONS
 XMLTransformerActionInit const aBackgroundImageActionTable[] =
 {
-    ENTRY1Q( DRAW, TRANSPARENCY, XML_ATACTION_RENAME_NEG_PERCENT,
-                     XML_NAMESPACE_DRAW, XML_OPACITY ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_DRAW,   XML_TRANSPARENCY,  
XML_ATACTION_RENAME_NEG_PERCENT, XML_NAMESPACE_DRAW, XML_OPACITY ),
+    ENTRY1(  XML_NAMESPACE_XLINK,  XML_HREF,          XML_ATACTION_URI_OOO,    
        sal_uInt32(true) ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 /* OOO_BACKGROUND_IMAGE_ACTIONS for OpenOffice.org text documents
@@ -926,162 +729,141 @@ XMLTransformerActionInit const 
aBackgroundImageActionTable[] =
 */
 XMLTransformerActionInit const aWriterBackgroundImageActionTable[] =
 {
-    ENTRY1Q( DRAW, TRANSPARENCY, 
XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY 
),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(true) ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_DRAW,   XML_TRANSPARENCY,  
XML_ATACTION_WRITER_BACK_GRAPHIC_TRANSPARENCY, XML_NAMESPACE_DRAW, XML_OPACITY 
),
+    ENTRY1(  XML_NAMESPACE_XLINK,  XML_HREF,          XML_ATACTION_URI_OOO,    
                      sal_uInt32(true) ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_DDE_CONNECTION_DECL
 XMLTransformerActionInit const aDDEConnectionDeclActionTable[] =
 {
-    ENTRY1Q( TEXT, NAME, XML_ATACTION_RENAME,
-                     XML_NAMESPACE_OFFICE, XML_NAME ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TEXT,   XML_NAME,          XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_NAME ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_FORM_CONTROL_ACTIONS
 XMLTransformerActionInit const aFormControlActionTable[] =
 {
-    ENTRY2QN( FORM, SERVICE_NAME,
-                    XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX,
-                       XML_NAMESPACE_FORM, XML_CONTROL_IMPLEMENTATION,
-                    XML_NAMESPACE_OOO ),
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY2QN( XML_NAMESPACE_FORM,   XML_SERVICE_NAME,  
XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_FORM, 
XML_CONTROL_IMPLEMENTATION, XML_NAMESPACE_OOO ),
+    ENTRY1(   XML_NAMESPACE_XLINK,  XML_HREF,          XML_ATACTION_URI_OOO, 
sal_uInt32(false) ),
+    ENTRY0(   XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_FORM_COLUMN_ACTIONS
 XMLTransformerActionInit const aFormColumnActionTable[] =
 {
-    ENTRY1Q( FORM, COLUMN_STYLE_NAME, 
XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF,
-                        XML_NAMESPACE_FORM, XML_TEXT_STYLE_NAME ),
-    ENTRY2QN( FORM, SERVICE_NAME,
-                    XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX,
-                       XML_NAMESPACE_FORM, XML_CONTROL_IMPLEMENTATION,
-                    XML_NAMESPACE_OOO ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q(  XML_NAMESPACE_FORM,   XML_COLUMN_STYLE_NAME, 
XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF, XML_NAMESPACE_FORM, 
XML_TEXT_STYLE_NAME ),
+    ENTRY2QN( XML_NAMESPACE_FORM,   XML_SERVICE_NAME,      
XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX,  XML_NAMESPACE_FORM, 
XML_CONTROL_IMPLEMENTATION, XML_NAMESPACE_OOO ),
+    ENTRY0(   XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,     XML_ATACTION_EOT )
 };
 
 // OOO_FORM_PROP_ACTIONS
 XMLTransformerActionInit const aFormPropActionTable[] =
 {
-    ENTRY1Q( FORM, PROPERTY_TYPE, XML_ATACTION_RENAME,
-                          XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
-    ENTRY0( FORM, PROPERTY_IS_LIST, XML_ATACTION_REMOVE ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_FORM,   XML_PROPERTY_TYPE,    XML_ATACTION_RENAME, 
XML_NAMESPACE_OFFICE, XML_VALUE_TYPE ),
+    ENTRY0(  XML_NAMESPACE_FORM,   XML_PROPERTY_IS_LIST, XML_ATACTION_REMOVE ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,    XML_ATACTION_EOT )
 };
 
 // OOO_XLINK_ACTIONS
 XMLTransformerActionInit const aXLinkActionTable[] =
 {
-    ENTRY1( XLINK, HREF, XML_ATACTION_URI_OOO, sal_uInt32(false) ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1( XML_NAMESPACE_XLINK,  XML_HREF,          XML_ATACTION_URI_OOO, 
sal_uInt32(false) ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_CONFIG_ITEM_SET_ACTIONS
 XMLTransformerActionInit const aConfigItemSetActionTable[] =
 {
-    ENTRY1( CONFIG, NAME, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                    XML_NAMESPACE_OOO ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1( XML_NAMESPACE_CONFIG, XML_NAME,          
XML_ATACTION_ADD_NAMESPACE_PREFIX, XML_NAMESPACE_OOO ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OASIS_FORMULA_ACTIONS
 XMLTransformerActionInit const aFormulaActionTable[] =
 {
-    ENTRY1( TEXT, CONDITION, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY1( TEXT, FORMULA, XML_ATACTION_ADD_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY1( TABLE, CONDITION, XML_ATACTION_ADD_APP_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY1( TABLE, FORMULA, XML_ATACTION_ADD_APP_NAMESPACE_PREFIX,
-                     XML_NAMESPACE_OOOW ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1( XML_NAMESPACE_TEXT,   XML_CONDITION,     
XML_ATACTION_ADD_NAMESPACE_PREFIX,     XML_NAMESPACE_OOOW ),
+    ENTRY1( XML_NAMESPACE_TEXT,   XML_FORMULA,       
XML_ATACTION_ADD_NAMESPACE_PREFIX,     XML_NAMESPACE_OOOW ),
+    ENTRY1( XML_NAMESPACE_TABLE,  XML_CONDITION,     
XML_ATACTION_ADD_APP_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY1( XML_NAMESPACE_TABLE,  XML_FORMULA,       
XML_ATACTION_ADD_APP_NAMESPACE_PREFIX, XML_NAMESPACE_OOOW ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_ERROR_MACRO_ACTIONS
 XMLTransformerActionInit const aErrorMacroActionTable[] =
 {
-    ENTRY0( TABLE, NAME, XML_ATACTION_REMOVE ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY0( XML_NAMESPACE_TABLE,  XML_NAME,          XML_ATACTION_REMOVE ),
+    ENTRY0( XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_DDE_CONV_MODE_ACTIONS
 XMLTransformerActionInit const aDDEConvModeActionTable[] =
 {
-    ENTRY1Q( TABLE, LET_TEXT, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_TABLE, XML_KEEP_TEXT ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TABLE,  XML_LET_TEXT,      XML_ATACTION_RENAME, 
XML_NAMESPACE_TABLE, XML_KEEP_TEXT ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_DATAPILOT_MEMBER_ACTIONS
 XMLTransformerActionInit const aDataPilotMemberActionTable[] =
 {
-    ENTRY1Q( TABLE, DISPLAY_DETAILS, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_TABLE, XML_SHOW_DETAILS ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TABLE,  XML_DISPLAY_DETAILS, XML_ATACTION_RENAME, 
XML_NAMESPACE_TABLE, XML_SHOW_DETAILS ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID,   XML_ATACTION_EOT )
 };
 
 // OOO_DATAPILOT_LEVEL_ACTIONS
 XMLTransformerActionInit const aDataPilotLevelActionTable[] =
 {
-    ENTRY1Q( TABLE, DISPLAY_EMPTY, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_TABLE, XML_SHOW_EMPTY ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TABLE,  XML_DISPLAY_EMPTY, XML_ATACTION_RENAME, 
XML_NAMESPACE_TABLE, XML_SHOW_EMPTY ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 
 // OOO_SOURCE_SERVICE_ACTIONS
 XMLTransformerActionInit const aSourceServiceActionTable[] =
 {
-    ENTRY1Q( TABLE, USERNAME, XML_ATACTION_RENAME,
-                        XML_NAMESPACE_TABLE, XML_USER_NAME ),
-    ENTRY0( OFFICE, TOKEN_INVALID, XML_ATACTION_EOT )
+    ENTRY1Q( XML_NAMESPACE_TABLE,  XML_USERNAME,      XML_ATACTION_RENAME, 
XML_NAMESPACE_TABLE, XML_USER_NAME ),
+    ENTRY0(  XML_NAMESPACE_OFFICE, XML_TOKEN_INVALID, XML_ATACTION_EOT )
 };
 

... etc. - the rest is truncated

Reply via email to