diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
| commit | 2176aee8e22caf0396c1b3b544a3549a0a417a8f (patch) | |
| tree | 36d0682e2aec8719ac65b8ca0be0d050d75a925f /wizards/com/sun/star/wizards/table | |
| parent | 722556b9cd099cbb352cb11692ec1b27adfac5dd (diff) | |
| parent | 055bc5c7f48cd556d256dedc32671f60ad30ccf4 (diff) | |
autorecovery: commit resolved merge (after rebase to m71)
Diffstat (limited to 'wizards/com/sun/star/wizards/table')
| -rw-r--r-- | wizards/com/sun/star/wizards/table/TableWizard.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 84accf582174..18a0a2a80e65 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -250,7 +250,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener, { curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields); curFieldFormatter = new FieldFormatter(this, curTableDescriptor); - if (this.curTableDescriptor.supportsCoreSQLGrammar()) + if ( this.curTableDescriptor.supportsPrimaryKeys() ) { curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor); } @@ -264,7 +264,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener, boolean bTableCreated = false; String schemaname = curFinalizer.getSchemaName(); String catalogname = curFinalizer.getCatalogName(); - if (curTableDescriptor.supportsCoreSQLGrammar()) + if (curTableDescriptor.supportsPrimaryKeys()) { String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor); if (keyfieldnames != null) @@ -353,7 +353,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener, int i = 0; i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE); i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE); - if (this.curTableDescriptor.supportsCoreSQLGrammar()) + if (this.curTableDescriptor.supportsPrimaryKeys()) { i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE); } |