#105166# insert new string for missing type info

3 files changed, 33 insertions, 8 deletions

diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc
index 7adebbdf44c8..ecb2230732bd 100644
--- a/dbaccess/source/ui/inc/dbu_tbl.hrc
+++ b/dbaccess/source/ui/inc/dbu_tbl.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_tbl.hrc,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:53:13 $
+ *  last change: $Author: oj $ $Date: 2002-11-19 11:42:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,10 +113,11 @@
 #define STR_TABLEDESIGN_CONNECTION_MISSING  RID_STR_TBL_START + 45
 #define STR_TABLEDESIGN_NO_PRIM_KEY_HEAD    RID_STR_TBL_START + 46
 #define STR_TABLEDESIGN_TITLE               RID_STR_TBL_START + 47
+#define STR_NO_TYPE_INFO_AVAILABLE          RID_STR_TBL_START + 48
 
 // please adjust checking before insert new strings
 
-#if STR_TABLEDESIGN_TITLE > RID_STR_TBL_END
+#if STR_NO_TYPE_INFO_AVAILABLE > RID_STR_TBL_END
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index ae1f66cc7b06..65cc47574fce 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TableController.cxx,v $
  *
- *  $Revision: 1.85 $
+ *  $Revision: 1.86 $
  *
- *  last change: $Author: oj $ $Date: 2002-11-14 07:55:57 $
+ *  last change: $Author: oj $ $Date: 2002-11-19 11:47:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -705,13 +705,30 @@ void SAL_CALL OTableController::initialize( const Sequence< Any >& aArguments )
             }
             OSL_ENSURE(m_xFormatter.is(),"No NumberFormatter!");
         }
+    }
+    catch(const SQLException&)
+    {
+        OSL_ENSURE(sal_False, "OTableController::initialize: caught an exception!");
+    }
+
+    try
+    {
         ::dbaui::fillTypeInfo(getConnection(),m_sTypeNames,m_aTypeInfo,m_aTypeInfoIndex);               // fill the needed type information
+    }
+    catch(const SQLException&)
+    {
+        OSQLMessageBox aErr(getView(),ModuleRes(STR_STAT_WARNING),ModuleRes(STR_NO_TYPE_INFO_AVAILABLE));
+        aErr.Execute();
+        throw;
+    }
+    try
+    {
         loadData();                 // fill the column information form the table
         getView()->initialize();    // show the windows and fill with our informations
         getUndoMgr()->Clear();      // clear all undo redo things
         setModified(sal_False);     // and we are not modified yet
     }
-    catch(SQLException&)
+    catch(const SQLException&)
     {
         OSL_ENSURE(sal_False, "OTableController::initialize: caught an exception!");
     }
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index 30367f217ef6..d670f7f6ad93 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: table.src,v $
  *
- *  $Revision: 1.69 $
+ *  $Revision: 1.70 $
  *
- *  last change: $Author: fs $ $Date: 2002-11-08 13:17:22 $
+ *  last change: $Author: oj $ $Date: 2002-11-19 11:47:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2319,3 +2319,10 @@ String STR_HELP_AUTOINCREMENT_VALUE
     Text[ thai ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created.";
 };
 
+String STR_NO_TYPE_INFO_AVAILABLE
+{
+    Text = "Es konnten keine Typinformationen von der Datenbank ermittelt werden.\nDer Tabellenentwurfmodus ist f�r diese Datenquelle nicht verf�gbar.";
+    Text[ english ] = "No type information could be retrieved from the database.\nThe table design mode is not available for this data source.";
+};
+
+