strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dbwizard4 (1.2.40); FILE MERGED

Browse source 
2005/03/12 21:44:14 bc 1.2.40.4: ## one line of merge conflict removed
Issue number:
Submitted by:
Reviewed by:
2005/03/12 18:29:49 bc 1.2.40.3: RESYNC: (1.2-1.3); FILE MERGED
2005/03/08 14:08:27 bc 1.2.40.2: #i43785#Several changes in handling new tables
2005/02/17 13:50:24 bc 1.2.40.1: ##ControlArrangement in FormWizard modified
This commit is contained in:
Kurt Zenker 2005-03-18 15:23:05 +00:00
parent e39a87aaef
commit 923df1ec5b
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wizards/com/sun/star/wizards/table/TableWizard.java
View file

@ -2,9 +2,9 @@
*
* $RCSfile: TableWizard.java,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: vg $ $Date: 2005-02-21 14:01:59 $
* last change: $Author: kz $ $Date: 2005-03-18 16:23:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -59,6 +59,7 @@
*/
package com.sun.star.wizards.table;
import java.util.Calendar;
import java.util.Hashtable;
import com.sun.star.awt.TextEvent;
@ -185,7 +186,6 @@ public class TableWizard extends WizardDialog implements XTextListener, XComplet
boolean bFieldFormatsiscompleted = _biscompleted;
boolean bPrimaryKeysiscompleted = _biscompleted;
boolean bFinalPageiscompleted = _biscompleted;
if (_ndialogpage == SOMAINPAGE)
curFinalizer.initialize(curScenarioSelector.getFirstTableName());
else
@ -226,10 +226,10 @@ public class TableWizard extends WizardDialog implements XTextListener, XComplet
if(xLocMSF != null){
System.out.println("Connected to "+ ConnectStr);
curproperties = new PropertyValue[1];
curproperties[0] = Properties.createProperty("DataSourceName", "Bibliography");
// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyDocAssign.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyDBase.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/New Database3.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MySQL-JDBC-Database.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyDocAssign.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/MyAccessDatabase.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; NewAccessDatabase, MyDocAssign baseLocation ); "DataSourceName", "db1");
// curproperties[0] = Properties.createProperty("DatabaseLocation", "file:///C:/Documents and Settings/bc93774.EHAM02-DEV/My Documents/New Database3.odb"); //MyDBase; Mydbwizard2DocAssign.odb; MyDBase.odb, Mydbwizard2DocAssign.odb ; Mydbwizard2DocAssign.odb; , MyDocAssign baseLocation ); "DataSourceName", "db1");
// curproperties[0] = Properties.createProperty("DataSourceName", "Bibliography"); //Bibliography
CurTableWizard.startTableWizard(xLocMSF, curproperties);
@ -403,4 +403,4 @@ public class TableWizard extends WizardDialog implements XTextListener, XComplet
}
}
}
}