Kaydet (Commit) 18ce58e9 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

INTEGRATION: CWS toolkit01 (1.5.18); FILE MERGED

2005/02/25 11:57:06 bc 1.5.18.2: RESYNC: (1.5-1.7); FILE MERGED
2005/02/23 17:38:36 bc 1.5.18.1: ##several changes in Webwizard
üst 7d12bb50
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: DBMetaData.java,v $ * $RCSfile: DBMetaData.java,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: vg $ $Date: 2005-02-21 14:20:03 $ * last change: $Author: vg $ $Date: 2005-03-08 15:35:05 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -114,7 +114,6 @@ import com.sun.star.sdbcx.XTablesSupplier; ...@@ -114,7 +114,6 @@ import com.sun.star.sdbcx.XTablesSupplier;
public class DBMetaData { public class DBMetaData {
public XNameAccess xTableNames; public XNameAccess xTableNames;
public XNameAccess xQueryNames; public XNameAccess xQueryNames;
private XInteractionHandler oInteractionHandler; private XInteractionHandler oInteractionHandler;
private XNameAccess xNameAccess; private XNameAccess xNameAccess;
...@@ -159,6 +158,7 @@ public class DBMetaData { ...@@ -159,6 +158,7 @@ public class DBMetaData {
private long lDateCorrection = INVALID; private long lDateCorrection = INVALID;
private boolean bdisposeConnection = false; private boolean bdisposeConnection = false;
public DBMetaData(XMultiServiceFactory xMSF) { public DBMetaData(XMultiServiceFactory xMSF) {
getInterfaces(xMSF); getInterfaces(xMSF);
InitializeWidthList(); InitializeWidthList();
...@@ -172,6 +172,8 @@ public class DBMetaData { ...@@ -172,6 +172,8 @@ public class DBMetaData {
} }
public NumberFormatter getNumberFormatter(){ public NumberFormatter getNumberFormatter(){
if (oNumberFormatter == null){ if (oNumberFormatter == null){
try { try {
...@@ -198,6 +200,7 @@ public class DBMetaData { ...@@ -198,6 +200,7 @@ public class DBMetaData {
} }
void getInterfaces(XMultiServiceFactory xMSF) { void getInterfaces(XMultiServiceFactory xMSF) {
try { try {
this.xMSF = xMSF; this.xMSF = xMSF;
...@@ -212,6 +215,7 @@ public class DBMetaData { ...@@ -212,6 +215,7 @@ public class DBMetaData {
} }
public void setCommandTypes() { public void setCommandTypes() {
int TableCount; int TableCount;
int QueryCount; int QueryCount;
...@@ -234,7 +238,6 @@ public class DBMetaData { ...@@ -234,7 +238,6 @@ public class DBMetaData {
} }
} }
public boolean hasTableByName(String _stablename){ public boolean hasTableByName(String _stablename){
getTableNames(); getTableNames();
return xTableNames.hasByName(_stablename); return xTableNames.hasByName(_stablename);
...@@ -273,7 +276,6 @@ public class DBMetaData { ...@@ -273,7 +276,6 @@ public class DBMetaData {
this.CommandObjects.addElement(oQueryObject); this.CommandObjects.addElement(oQueryObject);
} }
public class CommandObject { public class CommandObject {
public XNameAccess xColumns; public XNameAccess xColumns;
public XPropertySet xPropertySet; public XPropertySet xPropertySet;
...@@ -336,7 +338,6 @@ public class DBMetaData { ...@@ -336,7 +338,6 @@ public class DBMetaData {
WidthList[13][0] = DataType.DATE; // == 91; WidthList[13][0] = DataType.DATE; // == 91;
WidthList[14][0] = DataType.TIME; // == 92; WidthList[14][0] = DataType.TIME; // == 92;
WidthList[15][0] = DataType.TIMESTAMP; // == 93; WidthList[15][0] = DataType.TIMESTAMP; // == 93;
WidthList[16][0] = DataType.BOOLEAN; // == 16;
// NumericTypes are all types where aggregate functions can be performed on. // NumericTypes are all types where aggregate functions can be performed on.
// Similarly to a major competitor date/time/timmestamp fields are not included // Similarly to a major competitor date/time/timmestamp fields are not included
NumericTypes = new int[9]; NumericTypes = new int[9];
...@@ -485,7 +486,6 @@ public class DBMetaData { ...@@ -485,7 +486,6 @@ public class DBMetaData {
{ {
bdisposeConnection = true; bdisposeConnection = true;
com.sun.star.container.XChild child = (com.sun.star.container.XChild)UnoRuntime.queryInterface(com.sun.star.container.XChild.class, xConnection); com.sun.star.container.XChild child = (com.sun.star.container.XChild)UnoRuntime.queryInterface(com.sun.star.container.XChild.class, xConnection);
xDataSource = (XDataSource) UnoRuntime.queryInterface(XDataSource.class, child.getParent()); xDataSource = (XDataSource) UnoRuntime.queryInterface(XDataSource.class, child.getParent());
XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDataSource); XPropertySet xPSet = (XPropertySet) UnoRuntime.queryInterface(XPropertySet.class, xDataSource);
if ( xPSet != null ) if ( xPSet != null )
...@@ -818,7 +818,6 @@ public class DBMetaData { ...@@ -818,7 +818,6 @@ public class DBMetaData {
} }
} }
public boolean storeDatabaseDocumentToTempPath(XComponent _xcomponent, String _storename){ public boolean storeDatabaseDocumentToTempPath(XComponent _xcomponent, String _storename){
try { try {
XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment