INTEGRATION: CWS extras6 (1.24.2); FILE MERGED

2003/05/16 10:24:36 bc 1.24.2.2: #109370# column index access corrected
2003/05/15 15:52:04 bc 1.24.2.1: #109370# dbcolumnindex access modified

1 files changed, 7 insertions, 5 deletions

diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 755815691f87..b6c10e1a8b5e 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.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: rt $ $Date: 2003-04-30 08:26:52 $
+ *  last change: $Author: vg $ $Date: 2003-05-22 10:15:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -414,12 +414,14 @@ public class Dataimport extends ReportWizard{
         }
     setLayoutSectionsInvisible(GroupFieldCount);
     CurReportDocument.breakLinkofTextSections();
-    Object oTextTable= CurReportDocument.xTextTablesSupplier.getTextTables().getByName("FirstVisibleTextTable");
-    if (CorrBreakValue != null)
+    if (CurReportDocument.xTextTablesSupplier.getTextTables().hasByName("FirstVisibleTextTable")){
+        Object oTextTable = CurReportDocument.xTextTablesSupplier.getTextTables().getByName("FirstVisibleTextTable");
+        if (CorrBreakValue != null)
         Tools.setUNOPropertyValue(oTextTable, "BreakType", CorrBreakValue);
-    if (CorrPageDescName != "")
+        if (CorrPageDescName != "")
         Tools.setUNOPropertyValue(oTextTable, "PageDescName", CorrPageDescName);
     }
+    }
     catch( com.sun.star.uno.Exception exception ){
         exception.printStackTrace(System.out);
     }