diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 8f7cab8732d6..f52a3d79c430 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -109,7 +109,7 @@ public class CallTableWizard
                 if ( sEvent.compareTo("start") == 0 )
                 {
                     TableWizard CurTableWizard = new TableWizard( m_serviceFactory, m_wizardContext );
-                    CurTableWizard.startTableWizard();
+                    Command = CurTableWizard.startTableWizard();
                 }
             }
             catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 1995a442d58c..84accf582174 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -72,6 +72,8 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
     private String sMsgColumnAlreadyExists = "";
     String WizardHeaderText[] = new String[8];
 
+    private String m_tableName;
+
     public TableWizard( XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext )
     {
         super( xMSF, 41200, i_wizardContext );
@@ -304,6 +306,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
                 {
                     final boolean editTableDesign = (wizardmode == Finalizer.MODIFYTABLEMODE );
                     loadSubComponent( DatabaseObject.TABLE, curTableDescriptor.getComposedTableName(), editTableDesign );
+                    m_tableName = curTableDescriptor.getComposedTableName();
                     super.xDialog.endExecute();
                 }
             }
@@ -360,7 +363,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
         setCurrentRoadmapItemID((short) 1);
     }
 
-    public void startTableWizard(  )
+    public String startTableWizard(  )
     {
         try
         {
@@ -373,11 +376,11 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
                 insertFormRelatedSteps();
                 short RetValue = executeDialog();
                 xComponent.dispose();
-                if  (   ( RetValue == 0 )
-                    &&  ( wizardmode == Finalizer.STARTFORMWIZARDMODE )
-                    )
+                if ( RetValue == 0 )
                 {
-                    callFormWizard();
+                    if (  wizardmode == Finalizer.STARTFORMWIZARDMODE )
+                        callFormWizard();
+                    return m_tableName;
                 }
             }
         }
@@ -385,6 +388,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener,
         {
             jexception.printStackTrace(System.out);
         }
+        return "";
     }
 
     public boolean getTableResources()