diff options
Diffstat (limited to 'wizards/com/sun/star/wizards/db')
7 files changed, 9 insertions, 16 deletions
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 161af0457c6c..285e3e47725f 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -34,7 +34,7 @@ public class CommandName private String AliasName = PropertyNames.EMPTY_STRING; private boolean bCatalogAtStart; private String sCatalogSep; - private String sIdentifierQuote; + private boolean baddQuotation = true; public CommandName(CommandMetaData _CommandMetaData, String _DisplayName) @@ -176,7 +176,6 @@ public class CommandName { bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart(); sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator(); - sIdentifierQuote = oCommandMetaData.xDBMetaData.getIdentifierQuoteString(); return true; } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 980221dba203..d05d0aef0daf 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -85,8 +85,8 @@ public class DBMetaData private XPropertySet m_dataSourceSettings; private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; - private String[] DataSourceNames; - public String[] CommandNames; + + private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); private Locale aLocale; private int[] CommandTypes; @@ -201,7 +201,6 @@ public class DBMetaData this.xMSF = xMSF; xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext"); xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext ); - DataSourceNames = xNameAccess.getElementNames(); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 31a443dd1619..8987d254d88e 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -28,7 +28,7 @@ public class QueryMetaData extends CommandMetaData { private SQLQueryComposer oSQLQueryComposer = null; - FieldColumn CurFieldColumn; + public String Command; // Vector CommandNamesV; private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */ diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 4f8cb8994e14..1eba9a59bad7 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -41,12 +41,12 @@ public class RecordParser extends QueryMetaData { private XNameAccess xColumns; - com.sun.star.sdbc.XRow xRow; + private com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; private XInterface xRowSet; private XCompletedExecution xExecute; - private XColumnsSupplier xRowSetColumnsSupplier; + private XComponent xRowSetComponent; private XInteractionHandler xInteraction; public FieldColumn[] GroupFieldColumns; @@ -70,7 +70,7 @@ public class RecordParser extends QueryMetaData try { xRowSet = (XInterface) xMSF.createInstance("com.sun.star.sdb.RowSet"); - xRowSetColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); + UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); xRowSetComponent = UnoRuntime.queryInterface(XComponent.class, xRowSet); xExecute = UnoRuntime.queryInterface(XCompletedExecution.class, xRowSet); XInterface oInteraction = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler"); diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 7cdc8678b8d2..2423cc11ceba 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -40,7 +40,7 @@ import java.util.ArrayList; public class SQLQueryComposer { - public XColumnsSupplier xColSuppl; + private QueryMetaData CurDBMetaData; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index db77203b62c6..77c46538902b 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -65,7 +65,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private String[] sTableFilters = null; private ArrayList<ColumnDescriptor> columncontainer; private ArrayList<XPropertySet> keycolumncontainer; - public XHierarchicalNameAccess xTableHierarchicalNameAccess; + private CommandName ComposedTableName; private XAppend xKeyColAppend; private XColumnsSupplier xKeyColumnSupplier; diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index b0dbda221857..75f4f82ad837 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -51,15 +51,10 @@ public class TypeInspector public class TypeInfo { - - private int nDataType; - private String sDataTypeName; public boolean bisAutoIncrementable; private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable) { - nDataType = _nDataType; - sDataTypeName = _sDataTypeName; bisAutoIncrementable = _bisAutoIncrementable; } } |