summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-06-06 09:45:18 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-06-06 09:45:18 +0000
commit30a3e8e6e7e04e00f4ab729d5d49be9609302101 (patch)
treea299f00b4dd71dcf54c2b0c751b49e47d8888d29
parent9d74cf690baae2d2173953a5a8f5be32390f37a8 (diff)
INTEGRATION: CWS dba07 (1.52.8); FILE MERGED
2003/05/27 09:36:38 bc 1.52.8.2: #i14703# 'GetGroupFieldNames' call exchanged 2003/05/26 10:56:37 bc 1.52.8.1: #i14703# boolean flags to control listbox selections removed
-rw-r--r--wizards/com/sun/star/wizards/report/ReportWizard.java37
1 files changed, 19 insertions, 18 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 5f17a621484b..4e16a626da93 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -2,9 +2,9 @@
*
* $RCSfile: ReportWizard.java,v $
*
- * $Revision: 1.53 $
+ * $Revision: 1.54 $
*
- * last change: $Author: vg $ $Date: 2003-05-22 10:16:31 $
+ * last change: $Author: vg $ $Date: 2003-06-06 10:45:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -267,8 +267,8 @@ public class ReportWizard {
boolean[] baskbeforeOverwrite = new boolean[2];
boolean[] bmodifiedbySaveAsDialog = new boolean[2];
boolean bfinalaskbeforeOverwrite;
- boolean[] bCommandIsSelected = new boolean[1];
- boolean[] bDataSourceIsSelected = new boolean[1];
+// boolean[] bCommandIsSelected = new boolean[1];
+// boolean[] bDataSourceIsSelected = new boolean[1];
int iOldContentPos;
int iOldLayoutPos;
int ScrollBarValue;
@@ -365,7 +365,7 @@ public class ReportWizard {
bGetConnection = CurReportDocument.CurDBMetaData.getConnection(sMsgNoConnection, sMsgConnectionImpossible);
else
bGetConnection = true;
- bCommandIsSelected[0] = false;
+// bCommandIsSelected[0] = false;
fillupCommandListBox(CurReportDocument.CurDBMetaData, false);
}
if (bGetConnection == false)
@@ -529,10 +529,10 @@ public class ReportWizard {
int iKey = CurUNODialog.getControlKey(mouseEvent.Source, CurUNODialog.ControlList);
switch (iKey) {
case SODBLST:
- CurUNODialog.deletefirstListboxEntry("lstDatabases", slstDatabasesDefaultText, bDataSourceIsSelected);
+ CurUNODialog.deletefirstListboxEntry("lstDatabases", slstDatabasesDefaultText); //, bDataSourceIsSelected);
break;
case SOTBLLST:
- CurUNODialog.deletefirstListboxEntry("lstTables", slstTablesDefaultText, bCommandIsSelected);
+ CurUNODialog.deletefirstListboxEntry("lstTables", slstTablesDefaultText);//, bCommandIsSelected);
break;
default:
break;
@@ -554,17 +554,17 @@ public class ReportWizard {
int iKey = CurUNODialog.getControlKey(EventObject.Source, CurUNODialog.ControlList);
switch (iKey) {
case SODBLST:
- if (bDataSourceIsSelected[0] == true){
- CurUNODialog.deletefirstListboxEntry("lstDatabases", slstDatabasesDefaultText, bDataSourceIsSelected);
+// if (bDataSourceIsSelected[0] == true){
+ CurUNODialog.deletefirstListboxEntry("lstDatabases", slstDatabasesDefaultText); //, bDataSourceIsSelected);
getSelectedDBMetaData(xMSF);
- }
+// }
break;
case SOTBLLST:
- if (bCommandIsSelected[0] == true)
- CurUNODialog.deletefirstListboxEntry("lstTables", slstTablesDefaultText, bCommandIsSelected);
+// if (bCommandIsSelected[0] == true)
+ CurUNODialog.deletefirstListboxEntry("lstTables", slstTablesDefaultText); //, bCommandIsSelected);
fillUpFieldsListbox(CurReportDocument.CurDBMetaData, true);
- bCommandIsSelected[0] = true;
+// bCommandIsSelected[0] = true;
break;
case SOFLDSLST:
@@ -1244,8 +1244,9 @@ public class ReportWizard {
bIsSame = Arrays.equals(CurDBMetaData.GroupFieldNames, CurDBMetaData.OldGroupFieldNames) && (CurDBMetaData.GroupFieldNames != null);
CurDBMetaData.OldGroupFieldNames = Tools.copyStringArray(CurDBMetaData.GroupFieldNames);
}
- if ((bIsSame == true) && (iStep >= 4))
+ if ((bIsSame == true) && (iStep >= 4)){
bIsSame = Arrays.equals(CurDBMetaData.SortFieldNames, CurDBMetaData.OldSortFieldNames) && (CurDBMetaData.SortFieldNames != null);
+ }
return !bIsSame;
}
@@ -1262,11 +1263,11 @@ public class ReportWizard {
try{
String CurFieldTitle;
CurUNODialog.setFocus("lstSort1");
- if (checkIfToupdateStep(CurReportDocument.CurDBMetaData, 3) == true){
getGroupFieldNames(CurDBMetaData);
int FieldCount = CurDBMetaData.FieldNames.length;
int GroupFieldCount = CurDBMetaData.GroupFieldNames.length;
- SortFieldCount = FieldCount - CurDBMetaData.GroupFieldNames.length;
+ SortFieldCount = FieldCount - GroupFieldCount;
+ if (checkIfToupdateStep(CurReportDocument.CurDBMetaData, 3) == true){
if (SortFieldCount == 0)
PageAddCount = 2;
String SortFieldNames[] = new String[SortFieldCount + 1];
@@ -1300,7 +1301,7 @@ public class ReportWizard {
}
// System.out.println(xSortListBox[0].getSelectedItemPos());
}
- return (SortFieldCount > 0);
+ return (SortFieldCount > 0);
}
catch(Exception exception){
exception.printStackTrace(System.out);
@@ -1576,7 +1577,7 @@ public class ReportWizard {
LocDBList = UNODialogs.combineListboxList(slstDatabasesDefaultText, CurReportDocument.CurDBMetaData.DataSourceNames);
else
LocDBList = CurReportDocument.CurDBMetaData.DataSourceNames;
- bDataSourceIsSelected[0] = true;
+// bDataSourceIsSelected[0] = true;
CurUNODialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblDatabases",
new String[] {"Height", "Label", "PositionX", "PositionY", "Step", "TabIndex", "Width"},
new Object[] {new Integer(8), slblDatabases, new Integer(6), new Integer(39), new Integer(SOMAINPAGE), new Short((short) 1), new Integer(74)});