summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehrend Cornelius <bc@openoffice.org>2002-05-31 15:16:33 +0000
committerBehrend Cornelius <bc@openoffice.org>2002-05-31 15:16:33 +0000
commit3cfff7ebed51b98873fff5334e6dc730716f9e16 (patch)
treef8f3ae32b04ec49966d37637c92e709760f9bbc7
parente4fc273f0199f3e11b84c89315940f58a805aecf (diff)
#99085# Bug with Sorting fields resolved
-rw-r--r--wizards/com/sun/star/wizards/report/ReportWizard.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index f5f9439e5ffa..10b9ba5fa2ad 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.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: bc $ $Date: 2002-05-31 15:07:01 $
+ * last change: $Author: bc $ $Date: 2002-05-31 16:16:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -594,7 +594,7 @@ public class ReportWizard {
DBMetaData.createDBLink(CurDBMetaData.DataSource, sStorePath);
if (bUseTemplate == true){
PropertyValue[] oEmptyArgs = new PropertyValue[0];
- XComponentLoader xComponentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, xDesktop );
+ XComponentLoader xComponentLoader = (XComponentLoader) UnoRuntime.queryInterface(XComponentLoader.class, xDesktop);
CurReportDocument.oComponent = (Object) xComponentLoader.loadComponentFromURL(sStorePath, "_blank", 0, oEmptyArgs);
CurReportDocument.ReportTextDocument = (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, CurReportDocument.oComponent);
ReportDocument.initializeReportDocument(xGlobalMSF, CurReportDocument);
@@ -710,6 +710,13 @@ public class ReportWizard {
public static void setUpSortList(){
try{
short iCurState = 0;
+ MaxSortIndex = -1;
+ for (int i = 0; i < 4; i++){
+ if (xSortListBox[i].getSelectedItemPos() > 0)
+ MaxSortIndex += 1;
+ else
+ break;
+ }
CurDBMetaData.SortFieldNames = new String[MaxSortIndex+1][2];
for (int i=0;i<=MaxSortIndex;i++){
CurDBMetaData.SortFieldNames[i][0] = xSortListBox[i].getSelectedItem();
@@ -718,8 +725,6 @@ public class ReportWizard {
CurDBMetaData.SortFieldNames[i][1] = "ASC";
else
CurDBMetaData.SortFieldNames[i][1] = "DESC";
-
-// CurDBMetaData.SortFieldNames[i][1] = (String) UNODialogs.getPropertyOfDialogControl(xDlgNameAccess, "cmdSort_" + new Integer(i+1).toString(), "Tag");
}
}
catch( Exception exception ){
@@ -956,9 +961,6 @@ public class ReportWizard {
}}
-
-
-
public static void fillThirdStep(int iPage){
try{
if (bModify[iPage] == true){