diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 8aa6cebb10cb..e000c1488563 100644
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: text.mod,v 1.50 2002-06-11 14:17:50 dvo Exp $
+	$Id: text.mod,v 1.51 2002-06-11 14:59:33 dvo Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -427,7 +427,7 @@
 
 <!ENTITY % database-table "text:database-name CDATA #REQUIRED 
 						   text:table-name CDATA #REQUIRED
-						   text:command-type (table|query|command) #IMPLIED">
+						   text:table-type (table|query|command) #IMPLIED">
 
 <!ELEMENT text:database-display (#PCDATA)>
 <!ATTLIST text:database-display %database-table;>
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index b2f5866a83c2..722f67bf0251 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfldi.hxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: dvo $ $Date: 2002-06-11 13:23:40 $
+ *  last change: $Author: dvo $ $Date: 2002-06-11 14:59:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -175,7 +175,7 @@ enum XMLTextFieldAttrTokens
     XML_TOK_TEXTFIELD_LANGUAGE,
 
     XML_TOK_TEXTFIELD_MEASURE_KIND,
-    XML_TOK_TEXTFIELD_COMMAND_TYPE,
+    XML_TOK_TEXTFIELD_TABLE_TYPE,
 
     XML_TOK_TEXTFIELD_UNKNOWN
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 24571d1f4c7d..90040ebcc351 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmltoken.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: dvo $ $Date: 2002-06-11 12:23:55 $
+ *  last change: $Author: dvo $ $Date: 2002-06-11 14:59:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2113,7 +2113,7 @@ namespace xmloff { namespace token {
         TOKEN( "regression-curve" ),           // XML_REGRESSION_CURVE
         TOKEN( "error-indicator" ),            // XML_ERROR_INDICATOR
 
-        TOKEN( "command-type" ),               // XML_COMMAND_TYPE
+        TOKEN( "table-type" ),                 // XML_TABLE_TYPE
 
         { 0, NULL, NULL }                      // XML_TOKEN_END
     };
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 0346fce09a8a..3c744bb501d1 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtflde.cxx,v $
  *
- *  $Revision: 1.44 $
+ *  $Revision: 1.45 $
  *
- *  last change: $Author: dvo $ $Date: 2002-06-11 13:23:40 $
+ *  last change: $Author: dvo $ $Date: 2002-06-11 14:59:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2595,7 +2595,7 @@ void XMLTextFieldExport::ProcessCommandType(
     }
 
     if( eToken != XML_TOKEN_INVALID )
-        rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_COMMAND_TYPE, eToken );
+        rExport.AddAttribute( XML_NAMESPACE_TEXT, XML_TABLE_TYPE, eToken );
 }
 
 
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 5e5369aab50e..edb3ad58f350 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfldi.cxx,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: dvo $ $Date: 2002-06-11 13:23:40 $
+ *  last change: $Author: dvo $ $Date: 2002-06-11 14:59:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -416,7 +416,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
     { XML_NAMESPACE_TEXT, XML_IS_HIDDEN, XML_TOK_TEXTFIELD_IS_HIDDEN },
     { XML_NAMESPACE_TEXT, XML_CURRENT_VALUE,
                 XML_TOK_TEXTFIELD_CURRENT_VALUE },
-    { XML_NAMESPACE_TEXT, XML_COMMAND_TYPE, XML_TOK_TEXTFIELD_COMMAND_TYPE },
+    { XML_NAMESPACE_TEXT, XML_TABLE_TYPE, XML_TOK_TEXTFIELD_TABLE_TYPE },
 
     XML_TOKEN_MAP_END
 };
@@ -1546,7 +1546,7 @@ void XMLDatabaseFieldImportContext::ProcessAttribute(
             sTableName = sAttrValue;
             bTableOK = sal_True;
             break;
-        case XML_TOK_TEXTFIELD_COMMAND_TYPE:
+        case XML_TOK_TEXTFIELD_TABLE_TYPE:
             if( IsXMLToken( sAttrValue, XML_TABLE ) )
             {
                 nCommandType = sdb::CommandType::TABLE;
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 5f30882a31f5..065d871f4997 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtvfldi.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: dvo $ $Date: 2002-06-11 13:23:40 $
+ *  last change: $Author: dvo $ $Date: 2002-06-11 14:59:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1173,7 +1173,7 @@ void XMLDatabaseDisplayImportContext::ProcessAttribute(
             break;
         case XML_TOK_TEXTFIELD_DATABASE_NAME:
         case XML_TOK_TEXTFIELD_TABLE_NAME:
-        case XML_TOK_TEXTFIELD_COMMAND_TYPE:
+        case XML_TOK_TEXTFIELD_TABLE_TYPE:
             // handled by super class
             XMLDatabaseFieldImportContext::ProcessAttribute(nAttrToken,
                                                             sAttrValue);