#99921# check if datasource allows to check names

18 files changed, 272 insertions, 98 deletions

diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc
index b93ebc439ea9..8b2eafd97edb 100644
--- a/dbaccess/source/inc/dbustrings.hrc
+++ b/dbaccess/source/inc/dbustrings.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbustrings.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-03-21 07:22:52 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:48:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,6 +82,7 @@ namespace dbaui
     //= other DBU relevant strings
     //============================================================
     DECLARE_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW);
+    DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK);
 
     //============================================================
     //= other DBU properties
diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx
index 7b5b3850dbb1..b5f8b7534303 100644
--- a/dbaccess/source/shared/dbustrings.cxx
+++ b/dbaccess/source/shared/dbustrings.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbustrings.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2002-03-21 07:22:40 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:47:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,6 +76,7 @@ namespace dbaui
     //= other
     //============================================================
     IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW,  "QueryPreview");
+    IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLESQL92CHECK, "EnableSQL92Check");
 
     //============================================================
     //= properties
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index dc9d7d5740e9..b1ab4157eded 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsbrowserDnD.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-08 09:47:23 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:46:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -573,7 +573,13 @@ namespace dbaui
 
                 // here we have everything needed to create a new query object ...
                 // ... ehm, except a new name
-                OSaveAsDlg aAskForName(getView(), CommandType::QUERY, xDestQueries.get(), Reference< XDatabaseMetaData>(), sTargetName, SAD_ADDITIONAL_DESCRIPTION | SAD_TITLE_PASTE_AS);
+                OSaveAsDlg aAskForName( getView(),
+                                        CommandType::QUERY,
+                                        xDestQueries.get(),
+                                        Reference< XDatabaseMetaData>(),
+                                        Reference< XConnection>(),
+                                        sTargetName,
+                                        SAD_ADDITIONAL_DESCRIPTION | SAD_TITLE_PASTE_AS);
                 if (RET_OK != aAskForName.Execute())
                     // cancelled by the user
                     return;
@@ -1362,6 +1368,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.50  2002/07/08 09:47:23  oj
+ *  #98087# check d&d entries
+ *
  *  Revision 1.49  2002/07/08 08:11:22  oj
  *  #97156# saveData and d&d source corrected
  *
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index a20aa665b48c..f4ec889459f2 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbabrw.src,v $
  *
- *  $Revision: 1.76 $
+ *  $Revision: 1.77 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-09 07:46:43 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:46:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,9 +126,11 @@
         ID_RELATION_ADD_RELATION;\
         SID_INDEXDESIGN; \
         ID_BROWSER_DOCUMENT_DATASOURCE;\
+        ID_BROWSER_SAVERECORD; \
+        ID_BROWSER_UNDORECORD; \
     };\
     IdCount = {\
-    41;\
+    43;\
     }
 
  // Default Image-Liste ----------------------------------------------------------------
@@ -251,14 +253,13 @@ ToolBox RID_BRW_QRY_TOOLBOX
     };
     CUR_ITEM
     {
-        MID_SBA_QRY_SAVE
-        HelpID = ID_BROWSER_SAVEDOC ;
+        MID_SAVE_RECORD
     };
     CUR_ITEM
     {
-        MID_SBA_QRY_UNDO
-        HelpId = SID_UNDO ;
+        MID_UNDO_RECORD
     };
+
     CUR_SEPARATOR ;
     CUR_ITEM
     {
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 4047e781c358..8c13468fb736 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.cxx,v $
  *
- *  $Revision: 1.78 $
+ *  $Revision: 1.79 $
  *
- *  last change: $Author: fs $ $Date: 2002-01-30 14:15:30 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:43:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -228,6 +228,7 @@ ODbAdminDialog::ODbAdminDialog(Window* _pParent, SfxItemSet* _pItems, const Refe
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_SHOWDELETEDROWS, ::rtl::OUString::createFromAscii("ShowDeleted")));
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_ALLOWLONGTABLENAMES, ::rtl::OUString::createFromAscii("NoNameLengthLimit")));
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_ADDITIONALOPTIONS, ::rtl::OUString::createFromAscii("SystemDriverSettings")));
+    m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_SQL92CHECK, PROPERTY_ENABLESQL92CHECK));
 
     // special settings for adabas
     m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SHUTSERVICE, ::rtl::OUString::createFromAscii("ShutdownDatabase")));
@@ -718,6 +719,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
     *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, String());
     *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389);
     *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100);
+    *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False);
 
 
 
@@ -759,6 +761,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
         {0,0},
         {0,0},
         {0,0},
+        {0,0},
     };
 
     _rpPool = new SfxItemPool(String::CreateFromAscii("DSAItemPool"), DSID_FIRST_ITEM_ID, DSID_LAST_ITEM_ID,
@@ -2139,6 +2142,9 @@ IMPL_LINK(ODbAdminDialog, OnApplyChanges, PushButton*, EMPTYARG)
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.78  2002/01/30 14:15:30  fs
+ *  #97122# when selecting a data source, make sure it is no no-op causing unnecessary things
+ *
  *  Revision 1.77  2001/10/26 16:36:25  hr
  *  #92924#: includes
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index 169e68e7f2d3..b7745c63dcb9 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.hrc,v $
  *
- *  $Revision: 1.20 $
+ *  $Revision: 1.21 $
  *
- *  last change: $Author: oj $ $Date: 2001-06-25 08:24:31 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -117,10 +117,12 @@
 #define CB_HEADER               4
 #define CB_SUPPRESVERSIONCL     5
 #define CB_USECATALOG           6
+#define CB_SQL92CHECK           7
 
 #define FL_SEPARATOR1           1
 #define FL_SEPARATOR2           2
 #define FL_COLLECTION           3
+#define FL_SEPARATOR3           4
 
 #define CM_FIELDSEPARATOR       1
 #define CM_TEXTSEPARATOR        2
@@ -179,6 +181,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.20  2001/06/25 08:24:31  oj
+ *  #88699# new ids for controls
+ *
  *  Revision 1.19  2001/06/20 07:08:34  oj
  *  #88434# new page for user admin
  *
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 6f8d4d696bdc..0cc4d994ea46 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.100 $
+ *  $Revision: 1.101 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-13 12:47:08 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1215,6 +1215,8 @@ TabPage PAGE_DBASE
     {
         Pos = MAP_APPFONT ( 4 , 51 ) ;
         Size = MAP_APPFONT ( 252 , 8 ) ;
+        Text = "Allgemein";
+        Text [ english ] = "General";
     };
     CheckBox CB_SHOWDELETEDROWS
     {
@@ -1248,6 +1250,15 @@ TabPage PAGE_DBASE
         Text[ catalan ] = "Visualitza els registres i~nactius";
         Text[ thai ] = "แสดงระเบียนที่ไ~ม่ได้ใช้งานอยู่";
     };
+    CheckBox CB_SQL92CHECK
+    {
+        Pos     = MAP_APPFONT ( 7 , 76 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_SQL92CHECK;
+        Text = "SQL92 Names�berpr�fung verwenden";
+        Text [ english ] = "Use SQL92 naming convention";
+    };
     PushButton PB_INDICIES
     {
         Pos = MAP_APPFONT ( 199 , 165 ) ;
@@ -1401,6 +1412,24 @@ TabPage PAGE_ADO
         Text[ catalan ] = "Es necessita una contrasenya";
         Text[ thai ] = "ต้องการรหัสผ่าน";
     };
+
+    FixedLine FL_SEPARATOR2
+    {
+        Pos = MAP_APPFONT ( 4 , 64 ) ;
+        Size = MAP_APPFONT ( 252 , 8 ) ;
+        Text = "Allgemein";
+        Text [ english ] = "General";
+    };
+
+    CheckBox CB_SQL92CHECK
+    {
+        Pos     = MAP_APPFONT ( 6 , 75 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_SQL92CHECK;
+        Text = "SQL92 Names�berpr�fung verwenden";
+        Text [ english ] = "Use SQL92 naming convention";
+    };
 };
 
 //.........................................................................
@@ -1558,47 +1587,18 @@ TabPage PAGE_JDBC
     FixedLine FL_SEPARATOR1
     {
         Pos = MAP_APPFONT ( 4 , 64 ) ;
-        Size = MAP_APPFONT ( 252 , 1 ) ;
+        Size = MAP_APPFONT ( 252 , 8) ;
+        Text = "Allgemein";
+        Text [ english ] = "General";
     };
-    FixedText FT_CHARSET
+    CheckBox CB_SQL92CHECK
     {
-        Pos = MAP_APPFONT ( 6 , 70 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        Text = "~Zeichensatz:" ;
-        Text [ english ] = "~Character set:" ;
-        Text [ NORWEGIAN ] = "~Character set:" ;
-        Text [ DANISH ] = "Tegns�t" ;
-        Text [ english_US ] = "~Character set:" ;
-        Text [ SPANISH ] = "J~uego de caracteres:" ;
-        Text [ FINNISH ] = "~Merkist�:" ;
-        Text [ FRENCH ] = "~Jeu de caract�res :" ;
-        Text [ ITALIAN ] = "Ti~po di carattere:" ;
-        Text [ DUTCH ] = "~Tekenset:" ;
-        Text [ PORTUGUESE_BRAZILIAN ] = "~Conjunto de caracteres" ;
-        Text [ SWEDISH ] = "Te~ckenupps�ttning" ;
-        Text [ PORTUGUESE ] = "~Conjunto de caracteres" ;
-        Text [ chinese_simplified ] = "字符集(~C)：" ;
-        Text [ russian ] = "����� ������:" ;
-        Text [ polish ] = "Zbi�r znak�w:" ;
-        Text [ japanese ] = "文字列(~C)" ;
-        Text [ chinese_traditional ] = "字型(~C)：" ;
-        Text [ arabic ] = "������ ������:" ;
-        Text [ greek ] = "��� ����������:" ;
-        Text [ korean ] = "문자집합(~C)" ;
-        Text [ turkish ] = "Karakter k�mesi" ;
-        Text [ language_user1 ] = " :" ;
-        Text[ catalan ] = "Joc de ~car?cters:";
-        Text[ thai ] = "ชุดตัว~อักขระ:";
-    };
-    ListBox LB_CHARSET
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 90 , 70 ) ;
-        Size = MAP_APPFONT ( 105 , 60 ) ;
+        Pos     = MAP_APPFONT ( 6 , 75 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
-        DropDown = TRUE ;
-        CurPos = 0 ;
-        HelpId = HID_DSADMIN_CHARSET_JDBC;
+        HelpId = HID_DSADMIN_SQL92CHECK;
+        Text = "SQL92 Names�berpr�fung verwenden";
+        Text [ english ] = "Use SQL92 naming convention";
     };
 };
 
@@ -1761,10 +1761,26 @@ TabPage PAGE_ODBC
         CurPos = 0 ;
         HelpId = HID_DSADMIN_CHARSET_ODBC;
     };
+    FixedLine FL_SEPARATOR1
+    {
+        Pos = MAP_APPFONT ( 4 , 68 ) ;
+        Size = MAP_APPFONT ( 252 , 8 ) ;
+        Text = "Allgemein";
+        Text [ english ] = "General";
+    };
+    CheckBox CB_SQL92CHECK
+    {
+        Pos     = MAP_APPFONT ( 6 , 79 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_SQL92CHECK;
+        Text = "SQL92 Names�berpr�fung verwenden";
+        Text [ english ] = "Use SQL92 naming convention";
+    };
     CheckBox CB_USECATALOG
     {
-        Pos     = MAP_APPFONT ( 6 , 120 ) ;
-        Size    = MAP_APPFONT ( 200 , 12 ) ;
+        Pos     = MAP_APPFONT ( 6 , 92 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
         TabStop = TRUE ;
         HelpId = HID_DSADMIN_USECATALOG;
         Text = "Catalog verwenden bei dateibasierten Datenbanken";
@@ -2422,6 +2438,24 @@ TabPage PAGE_TEXT
         Text[ catalan ] = "Els comodins com ara ? o * no s'admeten a #1.";
         Text[ thai ] = "เช่น ตัวแทน ?,* ไม่อนุญาตให้อยู่ใน #1";
     };
+
+    FixedLine FL_SEPARATOR3
+    {
+        Pos = MAP_APPFONT ( 4 , 149 ) ;
+        Size = MAP_APPFONT ( 252 , 8 ) ;
+        Text = "Allgemein";
+        Text [ english ] = "General";
+    };
+
+    CheckBox CB_SQL92CHECK
+    {
+        Pos     = MAP_APPFONT ( 6 , 160 ) ;
+        Size    = MAP_APPFONT ( 200 , 10 ) ;
+        TabStop = TRUE ;
+        HelpId = HID_DSADMIN_SQL92CHECK;
+        Text = "SQL92 Names�berpr�fung verwenden";
+        Text [ english ] = "Use SQL92 naming convention";
+    };
 };
 //.........................................................................
 TabPage PAGE_TABLESUBSCRIPTION
@@ -2555,7 +2589,7 @@ TabPage PAGE_TABLESUBSCRIPTION
     CheckBox CB_SUPPRESVERSIONCL
     {
         Pos     = MAP_APPFONT ( 7 , 156 ) ;
-        Size    = MAP_APPFONT ( 246 , 12 ) ;
+        Size    = MAP_APPFONT ( 246 , 10 ) ;
         Group   = TRUE ;
         TabStop = TRUE ;
         HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL;
@@ -3621,6 +3655,9 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.100  2002/06/13 12:47:08  kz
+ *  Merge SRX642: 13.06.02 - 14:46:36
+ *
  *  Revision 1.99  2002/05/28 13:30:01  oj
  *  #99603# set maskcolor to magenta
  *
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 6d5a1c758432..c7786b1b1588 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-30 15:47:28 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,6 +136,7 @@ namespace dbaui
         ,m_pOptions(NULL)
         ,m_pCharsetLabel(NULL)
         ,m_pCharset(NULL)
+        ,m_pIsSQL92Check(NULL)
         ,m_nControlFlags(nControlFlags)
     {
         if ((m_nControlFlags & CBTP_USE_UIDPWD) == CBTP_USE_UIDPWD)
@@ -155,6 +156,12 @@ namespace dbaui
             m_pOptions->SetModifyHdl(getControlModifiedLink());
         }
 
+        if ((m_nControlFlags & CBTP_USE_SQL92CHECK) == CBTP_USE_SQL92CHECK)
+        {
+            m_pIsSQL92Check = new CheckBox(this, ResId(CB_SQL92CHECK));
+            m_pIsSQL92Check->SetClickHdl(getControlModifiedLink());
+        }
+
         if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
         {
             m_pCharsetLabel = new FixedText(this, ResId(FT_CHARSET));
@@ -188,6 +195,8 @@ namespace dbaui
 
         DELETEZ(m_pCharsetLabel);
         DELETEZ(m_pCharset);
+
+        DELETEZ(m_pIsSQL92Check);
     }
 
     // -----------------------------------------------------------------------
@@ -252,6 +261,7 @@ namespace dbaui
         SFX_ITEMSET_GET(_rSet, pOptionsItem, SfxStringItem, DSID_ADDITIONALOPTIONS, sal_True);
         SFX_ITEMSET_GET(_rSet, pCharsetItem, SfxStringItem, DSID_CHARSET, sal_True);
         SFX_ITEMSET_GET(_rSet, pAllowEmptyPwd, SfxBoolItem, DSID_PASSWORDREQUIRED, sal_True);
+        SFX_ITEMSET_GET(_rSet, pSQL92Check, SfxBoolItem, DSID_SQL92CHECK, sal_True);
 
         // forward the values to the controls
         if (bValid)
@@ -278,6 +288,13 @@ namespace dbaui
                     m_pOptions->SaveValue();
             }
 
+            if ((m_nControlFlags & CBTP_USE_SQL92CHECK) == CBTP_USE_SQL92CHECK)
+            {
+                m_pIsSQL92Check->Check(pSQL92Check->GetValue());
+                if (_bSaveValue)
+                    m_pIsSQL92Check->SaveValue();
+            }
+
             if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
             {
                 sal_Bool bAllowUTF8 = adjustUTF8(_rSet);
@@ -327,6 +344,11 @@ namespace dbaui
                 m_pOptions->Disable();
             }
 
+            if ((m_nControlFlags & CBTP_USE_SQL92CHECK) == CBTP_USE_SQL92CHECK)
+            {
+                m_pIsSQL92Check->Disable();
+            }
+
             if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
             {
                 m_pCharsetLabel->Disable();
@@ -364,6 +386,15 @@ namespace dbaui
             }
         }
 
+        if ((m_nControlFlags & CBTP_USE_SQL92CHECK) == CBTP_USE_SQL92CHECK)
+        {
+            if( m_pIsSQL92Check->IsChecked() != m_pIsSQL92Check->GetSavedValue() )
+            {
+                _rSet.Put(SfxBoolItem(DSID_SQL92CHECK, m_pIsSQL92Check->IsChecked()));
+                bChangedSomething = sal_True;
+            }
+        }
+
         if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
         {
             if (m_pCharset->GetSelectEntryPos() != m_pCharset->GetSavedValue())
@@ -384,7 +415,7 @@ namespace dbaui
     //========================================================================
     //------------------------------------------------------------------------
     ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET)
+        :OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_SQL92CHECK)
         ,m_aLine1           (this, ResId(FL_SEPARATOR1))
         ,m_aLine2           (this, ResId(FL_SEPARATOR2))
         ,m_aShowDeleted     (this, ResId(CB_SHOWDELETEDROWS))
@@ -414,6 +445,7 @@ namespace dbaui
             {
                 DSID_SHOWDELETEDROWS,
                 DSID_CHARSET,
+                DSID_SQL92CHECK,
                 0
             };
             pRelevantIds = nRelevantIds;
@@ -491,12 +523,13 @@ namespace dbaui
     //= OJdbcDetailsPage
     //========================================================================
     OJdbcDetailsPage::OJdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_JDBC, _rCoreAttrs, CBTP_USE_UIDPWD)
+        :OCommonBehaviourTabPage(pParent, PAGE_JDBC, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_SQL92CHECK)
 
         ,m_aDriverLabel     (this, ResId(FT_JDBCDRIVERCLASS))
         ,m_aDriver          (this, ResId(ET_JDBCDRIVERCLASS))
         ,m_aJdbcUrlLabel    (this, ResId(FT_CONNECTURL))
         ,m_aJdbcUrl         (this, ResId(ET_CONNECTURL))
+        ,m_aSeparator1      (this, ResId(FL_SEPARATOR1))
     {
         m_aDriver.SetModifyHdl(getControlModifiedLink());
         m_aJdbcUrl.SetModifyHdl(getControlModifiedLink());
@@ -521,6 +554,7 @@ namespace dbaui
             static sal_Int32 nRelevantIds[] =
             {
                 DSID_JDBCDRIVERCLASS,
+                DSID_SQL92CHECK,
                 0
             };
             pRelevantIds = nRelevantIds;
@@ -588,11 +622,12 @@ namespace dbaui
     //= OAdoDetailsPage
     //========================================================================
     OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, CBTP_USE_UIDPWD)
+        :OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_SQL92CHECK)
 
         ,m_aAdoUrlLabel     (this, ResId(FT_CONNECTURL))
         ,m_aAdoUrl          (this, ResId(ET_CONNECTURL))
         ,m_aSeparator1      (this, ResId(FL_SEPARATOR1))
+        ,m_aSeparator2      (this, ResId(FL_SEPARATOR2))
     {
         m_aAdoUrl.SetModifyHdl(getControlModifiedLink());
 
@@ -615,6 +650,7 @@ namespace dbaui
         {
             static sal_Int32 nRelevantIds[] =
             {
+                DSID_SQL92CHECK,
                 0
             };
             pRelevantIds = nRelevantIds;
@@ -670,7 +706,7 @@ namespace dbaui
     //= OOdbcDetailsPage
     //========================================================================
     OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
+        :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_CHARSET | CBTP_USE_OPTIONS | CBTP_USE_SQL92CHECK)
         ,m_aSeparator1  (this, ResId(FL_SEPARATOR1))
         ,m_aUseCatalog  (this, ResId(CB_USECATALOG))
     {
@@ -695,6 +731,7 @@ namespace dbaui
                 DSID_ADDITIONALOPTIONS,
                 DSID_CHARSET,
                 DSID_USECATALOG,
+                DSID_SQL92CHECK,
                 0
             };
             pRelevantIds = nRelevantIds;
@@ -732,7 +769,7 @@ namespace dbaui
     //= OAdabasDetailsPage
     //========================================================================
     OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_CHARSET)
+        :OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_UIDPWD | CBTP_USE_CHARSET | CBTP_USE_SQL92CHECK)
             // Yes, we're using the resource for the ODBC page here. It contains two controls which we don't use
             // and except that it's excatly what we need here.
         ,m_aSeparator1  (this, ResId(FL_SEPARATOR1))
@@ -767,6 +804,7 @@ namespace dbaui
         {
             static sal_Int32 nRelevantIds[] =
             {
+                DSID_SQL92CHECK,
                 DSID_CHARSET,
                 0
             };
@@ -884,7 +922,7 @@ namespace dbaui
     //========================================================================
     //------------------------------------------------------------------------
     OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, PAGE_TEXT, _rCoreAttrs, CBTP_USE_CHARSET)
+        :OCommonBehaviourTabPage(pParent, PAGE_TEXT, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_SQL92CHECK)
         ,m_aLineFormat              (this, ResId(FL_SEPARATOR2))
         ,m_aHeader                  (this, ResId(CB_HEADER))
         ,m_aFieldSeparatorLabel     (this, ResId(FT_FIELDSEPARATOR))
@@ -898,6 +936,7 @@ namespace dbaui
         ,m_aSeparator1              (this, ResId(FL_SEPARATOR1))
         ,m_aExtensionLabel          (this, ResId(FT_EXTENSION))
         ,m_aExtension               (this, ResId(CM_EXTENSION))
+        ,m_aSeparator3              (this, ResId(FL_SEPARATOR3))
 
         ,m_aFieldSeparatorList  (ResId(STR_FIELDSEPARATORLIST))
         ,m_aTextSeparatorList   (ResId(STR_TEXTSEPARATORLIST))
@@ -951,6 +990,7 @@ namespace dbaui
                 DSID_TEXTFILEEXTENSION,
                 DSID_TEXTFILEHEADER,
                 DSID_CHARSET,
+                DSID_SQL92CHECK,
                 0
             };
             pRelevantIds = nRelevantIds;
@@ -1187,6 +1227,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.13  2002/04/30 15:47:28  fs
+ *  #97118# remove user/password - not used at the moment
+ *
  *  Revision 1.12  2002/03/22 09:05:42  oj
  *  #98142# remove charset for jdbc drivers
  *
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 09a264766083..eef5541d9240 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: detailpages.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fs $ $Date: 2002-04-30 15:55:26 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,6 +81,7 @@ namespace dbaui
     #define     CBTP_USE_UIDPWD     0x0001
     #define     CBTP_USE_CHARSET    0x0002
     #define     CBTP_USE_OPTIONS    0x0004
+    #define     CBTP_USE_SQL92CHECK 0x0010
 
     /** eases the implementation of tab pages handling user/password and/or character
         set and/or generic options input
@@ -103,6 +104,8 @@ namespace dbaui
         FixedText*          m_pCharsetLabel;
         ListBox*            m_pCharset;
 
+        CheckBox*           m_pIsSQL92Check;
+
         OCharsetDisplay     m_aCharsets;
 
         USHORT              m_nControlFlags;
@@ -170,6 +173,7 @@ namespace dbaui
         Edit                m_aDriver;
         FixedText           m_aJdbcUrlLabel;
         OConnectionURLEdit  m_aJdbcUrl;
+        FixedLine           m_aSeparator1;
 
         OJdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
         ~OJdbcDetailsPage();
@@ -193,6 +197,7 @@ namespace dbaui
         FixedText           m_aAdoUrlLabel;
         OConnectionURLEdit  m_aAdoUrl;
         FixedLine           m_aSeparator1;
+        FixedLine           m_aSeparator2;
 
         OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
         ~OAdoDetailsPage();
@@ -292,6 +297,7 @@ namespace dbaui
         FixedLine   m_aSeparator1;
         FixedText   m_aExtensionLabel;
         ComboBox    m_aExtension;
+        FixedLine   m_aSeparator3;
 
         String      m_aFieldSeparatorList;
         String      m_aTextSeparatorList;
@@ -316,6 +322,9 @@ namespace dbaui
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.10  2002/04/30 15:55:26  fs
+ *  #97118# remove user/password - not used at the moment
+ *
  *  Revision 1.9  2002/03/22 09:05:42  oj
  *  #98142# remove charset for jdbc drivers
  *
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 4681ed4a8f3a..9a856e91e3f2 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-16 07:46:59 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,9 @@
 #ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #include <connectivity/dbtools.hxx>
 #endif
+#ifndef DBAUI_TOOLS_HXX
+#include "UITools.hxx"
+#endif
 
 
 using namespace dbaui;
@@ -100,6 +103,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                         const sal_Int32& _rType,
                         const Reference<XNameAccess>& _rxNames,
                         const Reference< XDatabaseMetaData>& _rxMetaData,
+                        const Reference< XConnection>& _xConnection,
                         const String& rDefault,
                         sal_Int32 _nFlags)
              :ModalDialog( pParent, ModuleRes(DLG_SAVE_AS))
@@ -109,7 +113,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
              ,m_aSchemaLbl(this, ResId (FT_SCHEMA))
              ,m_aSchema(this, ResId (ET_SCHEMA),_rxMetaData.is() ? _rxMetaData->getExtraNameCharacters() : ::rtl::OUString())
              ,m_aLabel(this, ResId (FT_TITLE))
-             ,m_aTitle(this, ResId (ET_TITLE),_rxMetaData.is() ? _rxMetaData->getExtraNameCharacters() : ::rtl::OUString())
+             ,m_aTitle(this, ResId (ET_TITLE), _rxMetaData.is() ? _rxMetaData->getExtraNameCharacters() : ::rtl::OUString())
              ,m_aPB_OK(this, ResId( PB_OK ) )
              ,m_aPB_CANCEL(this, ResId( PB_CANCEL ))
              ,m_aPB_HELP(this, ResId( PB_HELP))
@@ -147,7 +151,6 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                 SetSizePixel(Size(GetSizePixel().Width(), nNewHeight));
 
                 m_aTitle.SetText(m_aName);
-                m_aTitle.setCheck(); // enable non valid sql chars as well
             }
             break;
         case CommandType::TABLE:
@@ -249,6 +252,13 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
                 m_aSchema.SetMaxTextLen(nLength);
                 m_aCatalog.SetMaxTextLen(nLength);
 
+                if ( _xConnection.is() && isSQL92CheckEnabled(_xConnection) )
+                {
+                    m_aTitle.setCheck(sal_True); // enable non valid sql chars as well
+                    m_aSchema.setCheck(sal_True); // enable non valid sql chars as well
+                    m_aCatalog.setCheck(sal_True); // enable non valid sql chars as well
+                }
+
 
                 Size aSize = GetSizePixel();
                 aSize.Height() =
diff --git a/dbaccess/source/ui/dlg/dsitems.hxx b/dbaccess/source/ui/dlg/dsitems.hxx
index ac35151d393c..eed01963e73d 100644
--- a/dbaccess/source/ui/dlg/dsitems.hxx
+++ b/dbaccess/source/ui/dlg/dsitems.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dsitems.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2001-06-25 08:27:36 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,18 +100,22 @@
 #define DSID_CONN_LDAP_BASEDN       33
 #define DSID_CONN_LDAP_PORTNUMBER   34
 #define DSID_CONN_LDAP_ROWCOUNT     35
+#define DSID_SQL92CHECK             36
 
 //========================================================================
 //= item range. Adjust this if you introduce new items above
 
 #define DSID_FIRST_ITEM_ID  DSID_NAME
-#define DSID_LAST_ITEM_ID   DSID_CONN_LDAP_ROWCOUNT
+#define DSID_LAST_ITEM_ID   DSID_SQL92CHECK
 
 #endif // _DBAUI_DATASOURCEITEMS_HXX_
 
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.10  2001/06/25 08:27:36  oj
+ *  #88699# new control for ldap rowcount
+ *
  *  Revision 1.9  2001/05/29 13:11:52  oj
  *  #87149# addressbook ui impl
  *
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 8ad1ca828071..10458af35a02 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 12:28:12 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:37:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -261,6 +261,14 @@ namespace dbaui
 
     void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId );
 
+    /** check if SQL92 name checking is enabled
+        @param  _xConnection
+            Used to get the datasource as parent from the conenction.
+        @return
+            <TRUE/> if so otherwise <FALSE/>
+    */
+    sal_Bool isSQL92CheckEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
+
 // .........................................................................
 }
 // .........................................................................
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index d87ff0219c5a..d2b7abb2cb92 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgsave.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-16 07:50:32 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:37:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,6 +123,7 @@ namespace dbaui
         OSaveAsDlg( Window * pParent,const sal_Int32& _rType,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>&  _rxNames,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMetaData,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
                     const String& rDefault,
                     sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS);
 
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 9abce9ac1ec9..a30659843b5a 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UITools.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: fs $ $Date: 2002-05-24 12:46:46 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:36:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1096,7 +1096,37 @@ void adjustBrowseBoxColumnWidth( ::svt::EditBrowseBox* _pBox, sal_uInt16 _nColId
         _pBox->SetColumnWidth( _nColId, nValue );
     }
 }
-
+// -----------------------------------------------------------------------------
+// check if SQL92 name checking is enabled
+sal_Bool isSQL92CheckEnabled(const Reference<XConnection>& _xConnection)
+{
+    sal_Bool bCheckNames = sal_False;
+    try
+    {
+        Reference< XChild> xChild(_xConnection, UNO_QUERY);
+        if ( xChild.is() )
+        {
+            Reference< XPropertySet> xProp(xChild->getParent(),UNO_QUERY);
+            if ( xProp.is() )
+            {
+                Sequence< PropertyValue > aSeq;
+                xProp->getPropertyValue(PROPERTY_INFO) >>= aSeq;
+                const PropertyValue* pBegin = aSeq.getConstArray();
+                const PropertyValue* pEnd     = pBegin + aSeq.getLength();
+                for(;pBegin != pEnd;++pBegin)
+                {
+                    if ( pBegin->Name == PROPERTY_ENABLESQL92CHECK )
+                        pBegin->Value >>= bCheckNames;
+                }
+            }
+        }
+    }
+    catch(SQLException&)
+    {
+        OSL_ASSERT(!"isSQL92CheckEnabled");
+    }
+    return bCheckNames;
+}
 // .........................................................................
 }
 // .........................................................................
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 215f6a5b271c..6aa928905ac8 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontroller.cxx,v $
  *
- *  $Revision: 1.78 $
+ *  $Revision: 1.79 $
  *
- *  last change: $Author: as $ $Date: 2002-06-24 10:28:54 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:39:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1036,8 +1036,12 @@ sal_Bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElement
 
 
         OSaveAsDlg aDlg(
-            getView(), m_bCreateView ? CommandType::TABLE : CommandType::QUERY, _xElements,
-                xMetaData, aDefaultName,
+                getView(),
+                m_bCreateView ? CommandType::TABLE : CommandType::QUERY,
+                _xElements,
+                xMetaData,
+                getConnection(),
+                aDefaultName,
                 _bSaveAs ? SAD_OVERWRITE : SAD_DEFAULT);
 
         if(bRet = (aDlg.Execute() == RET_OK))
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index e20ea34da8df..2070fc618688 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TEditControl.cxx,v $
  *
- *  $Revision: 1.28 $
+ *  $Revision: 1.29 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-02 07:58:53 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:38:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -333,9 +333,10 @@ void OTableEditorCtrl::InitCellController()
     // Zelle Feldname
     xub_StrLen nMaxTextLen = EDIT_NOLIMIT;
     ::rtl::OUString sExtraNameChars;
+    Reference<XConnection> xCon;
     try
     {
-        Reference<XConnection> xCon = GetView()->getController()->getConnection();
+        xCon = GetView()->getController()->getConnection();
         Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>();
 
         nMaxTextLen = ((xub_StrLen)xMetaData.is() ? xMetaData->getMaxColumnNameLength() : 0);
@@ -343,6 +344,7 @@ void OTableEditorCtrl::InitCellController()
         if( nMaxTextLen == 0 )
             nMaxTextLen = EDIT_NOLIMIT;
         sExtraNameChars = xMetaData.is() ? xMetaData->getExtraNameCharacters() : ::rtl::OUString();
+
     }
     catch(SQLException&)
     {
@@ -351,6 +353,8 @@ void OTableEditorCtrl::InitCellController()
 
     pNameCell = new OSQLNameEdit( &GetDataWindow(), sExtraNameChars,WB_LEFT );
     pNameCell->SetMaxTextLen( nMaxTextLen );
+    pNameCell->setCheck( isSQL92CheckEnabled(xCon) );
+
 
     //////////////////////////////////////////////////////////////////////
     // Zelle Typ
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 8bbe19f41454..3e95200a95b4 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TEditControl.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: oj $ $Date: 2002-02-06 08:26:21 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:38:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,6 +82,7 @@ class SfxUndoManager;
 namespace dbaui
 {
     class OTableDescWin;
+    class OSQLNameEdit;
 
     class OTableEditorCtrl : public OTableRowView
     {
@@ -98,7 +99,7 @@ namespace dbaui
 
         EEditMode                   eEditMode;
 
-        Edit*                       pNameCell;
+        OSQLNameEdit*               pNameCell;
         ::svt::ListBoxControl*      pTypeCell;
         Edit*                       pDescrCell;
         OTableFieldDescWin*         pDescrWin;          // properties of one column
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 50cd9d35a428..85418deb1fa3 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.72 $
+ *  $Revision: 1.73 $
  *
- *  last change: $Author: oj $ $Date: 2002-07-02 14:17:06 $
+ *  last change: $Author: oj $ $Date: 2002-07-09 12:38:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -463,7 +463,7 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
                 aDefaultName = ::dbaui::createDefaultName(getConnection()->getMetaData(),xTables,aName);
             }
 
-            OSaveAsDlg aDlg(getView(),CommandType::TABLE,xTables,getConnection()->getMetaData(),aDefaultName);
+            OSaveAsDlg aDlg(getView(),CommandType::TABLE,xTables,getConnection()->getMetaData(),getConnection(),aDefaultName);
             if(aDlg.Execute() == RET_OK)
             {
                 m_sName = aDlg.getName();