INTEGRATION: CWS extras4 (1.21.2.2.12); FILE MERGED

2003/03/31 11:40:39 bc 1.21.2.2.12.6: #107595# Hint Label changed in Size
2003/03/28 17:30:58 bc 1.21.2.2.12.5: #107595# Some casting errors solved
2003/03/24 15:43:00 bc 1.21.2.2.12.4: #107595# checkiftoupdate function improved
2003/03/14 15:07:06 bc 1.21.2.2.12.3: #107468# Tabindices for labels introduced
2003/03/05 16:45:07 bc 1.21.2.2.12.2: #107595# Error in getting SortFieldNames resolved
2003/03/03 16:43:34 bc 1.21.2.2.12.1: #107593# Sortoption criterias now checked if duplicate

1 files changed, 18 insertions, 10 deletions

diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 83e20b144803..a70dbe8d5017 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Dataimport.java,v $
  *
- *  $Revision: 1.22 $
+ *  $Revision: 1.23 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-27 17:58:32 $
+ *  last change: $Author: vg $ $Date: 2003-04-11 15:03:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,6 +161,7 @@ public class Dataimport extends ReportWizard{
     ReportDocument CurReportDocument;
     UNODialogs CurUNOProgressDialog;
     static boolean bStopProcess;
+    static boolean brenamefirstTable = true;
 
     public Dataimport() {
     }
@@ -414,16 +415,17 @@ public class Dataimport extends ReportWizard{
         insertDataToRecordTable(xTextCursor, DataVector, RecordFieldCount);
         }
         else{
-        xTextDocument.unlockControllers();
+        CurReportDocument.unlockallControllers();
         return;
         }
         }
     setLayoutSectionsInvisible(GroupFieldCount);
     CurReportDocument.breakLinkofTextSections();
+    Object oTextTable= CurReportDocument.xTextTablesSupplier.getTextTables().getByName("FirstVisibleTextTable");
     if (CorrBreakValue != null)
-        Tools.setUNOPropertyValue(xGroupBaseTables[0], "BreakType", CorrBreakValue);
+        Tools.setUNOPropertyValue(oTextTable, "BreakType", CorrBreakValue);
     if (CorrPageDescName != "")
-        Tools.setUNOPropertyValue(xGroupBaseTables[0], "PageDescName", CorrPageDescName);
+        Tools.setUNOPropertyValue(oTextTable, "PageDescName", CorrPageDescName);
     }
     catch( com.sun.star.uno.Exception exception ){
         exception.printStackTrace(System.out);
@@ -432,8 +434,7 @@ public class Dataimport extends ReportWizard{
     catch(java.lang.Exception javaexception ){
         javaexception.printStackTrace(System.out);
     }
-    if (CurReportDocument.xTextDocument.hasControllersLocked())
-        CurReportDocument.xTextDocument.unlockControllers();
+    CurReportDocument.unlockallControllers();
     }
 
 
@@ -495,11 +496,11 @@ public class Dataimport extends ReportWizard{
 
     public void addLinkedTextSection(XTextCursor xTextCursor, String sLinkRegion, ReportDocument.DBColumn CurDBColumn, Object CurGroupValue){
     try{
-    Object oTextSection =  CurReportDocument.xMSFDoc.createInstance("com.sun.star.text.TextSection");
-    XTextContent xTextSectionContent = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, oTextSection);
+    XInterface xTextSection = (XInterface) CurReportDocument.xMSFDoc.createInstance("com.sun.star.text.TextSection");
+    XTextContent xTextSectionContent = (XTextContent) UnoRuntime.queryInterface(XTextContent.class, xTextSection);
     xTextCursor.gotoEnd(false);
     xTextCursor.getText().insertTextContent(xTextCursor, xTextSectionContent, true);
-    Tools.setUNOPropertyValue(oTextSection, "LinkRegion", sLinkRegion);
+    Tools.setUNOPropertyValue(xTextSection, "LinkRegion", sLinkRegion);
     if (CurDBColumn != null){
         boolean bIsGroupTable = (sLinkRegion.equals("RecordSection") != true);
         if (bIsGroupTable == true){
@@ -508,6 +509,13 @@ public class Dataimport extends ReportWizard{
         CurDBColumn.modifyCellContent(xCellRange, CurGroupValue);
         }
     }
+    if (brenamefirstTable == true){
+        brenamefirstTable = false;
+        XTextTable xTextTable = CurReportDocument.getlastTextTable();
+        XNamed xNamedTable = (XNamed) UnoRuntime.queryInterface(XNamed.class, xTextTable);
+        xNamedTable.setName("FirstVisibleTextTable");
+
+    }
     }
     catch( com.sun.star.uno.Exception exception ){
         exception.printStackTrace(System.out);