diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:15:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-12-28 16:15:25 +0000 |
| commit | b83995160d527fb8c3a6f8677e1e008fdef2cb17 (patch) | |
| tree | 05ad5066f17e083d9a695afb4026627dfade1884 /wizards | |
| parent | 5f480b13943d76acef2ce897b0c91a03b0f90b5c (diff) | |
INTEGRATION: CWS dbwizardpp1 (1.6.30); FILE MERGED
2005/12/06 00:46:51 bc 1.6.30.2: RESYNC: (1.6-1.7); FILE MERGED
2005/08/18 08:30:56 bc 1.6.30.1: #44613# Relations now with own class retrieved
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/CommandMetaData.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index c69546604f64..8ea0e1b775c0 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -4,9 +4,9 @@ * * $RCSfile: CommandMetaData.java,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:23:15 $ + * last change: $Author: hr $ $Date: 2005-12-28 17:15:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -406,6 +406,7 @@ public class CommandMetaData extends DBMetaData { XPropertySet xPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xIndexKeys.getByIndex(i) ); int curtype = AnyConverter.toInt(xPropertySet.getPropertyValue("Type")); if (curtype == KeyType.FOREIGN){ + // getImportedKeys (RelationController.cxx /source/ui/relationdesign) /Zeile 475 String sreftablename = AnyConverter.toString(xPropertySet.getPropertyValue("ReferencedTable")); if (xTableNames.hasByName(sreftablename)) TableVector.addElement(sreftablename); @@ -437,11 +438,11 @@ public class CommandMetaData extends DBMetaData { XColumnsSupplier xColumnsSupplier = (XColumnsSupplier) UnoRuntime.queryInterface(XColumnsSupplier.class, xPropertySet); String[] smastercolnames = xColumnsSupplier.getColumns().getElementNames(); skeycolumnnames = new String[2][smastercolnames.length]; - skeycolumnnames[1] = smastercolnames; - skeycolumnnames[0] = new String[smastercolnames.length]; + skeycolumnnames[0] = smastercolnames; + skeycolumnnames[1] = new String[smastercolnames.length]; for (int n = 0; n < smastercolnames.length; n++){ XPropertySet xcolPropertySet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xColumnsSupplier.getColumns().getByName(smastercolnames[n])); - skeycolumnnames[0][n] = AnyConverter.toString(xcolPropertySet.getPropertyValue("RelatedColumn")); + skeycolumnnames[1][n] = AnyConverter.toString(xcolPropertySet.getPropertyValue("RelatedColumn")); } return skeycolumnnames; } |