CWS-TOOLING: integrate CWS dba31b

author: Vladimir Glazounov <vg@openoffice.org> 2008-10-01 12:28:29 +0000
committer: Vladimir Glazounov <vg@openoffice.org> 2008-10-01 12:28:29 +0000
commit: d2b287cdd4f5bbe93b136d9f2bf2bf2cebfcbdb6 (patch)
tree: 4f639206bc55b316e2be549cdb3d4db323fb3e0f /dbaccess/source/ui/dlg
parent: c8ebff286bc889d44236ab17de63fc3712c97acd (diff)
28 files changed, 478 insertions, 388 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasStatDlg.cxx b/dbaccess/source/ui/dlg/AdabasStatDlg.cxx
index fc0b822006b5..459d8ac1ba4d 100644
--- a/dbaccess/source/ui/dlg/AdabasStatDlg.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStatDlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: AdabasStatDlg.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -103,11 +103,11 @@ DBG_NAME(OAdabasStatPageDlg)
         delete pExampleSet;
         pExampleSet = new SfxItemSet(*GetInputSetImpl());
 
-        DATASOURCE_TYPE eType = m_pImpl->getDatasourceType(*GetInputSetImpl());
+        ::dbaccess::DATASOURCE_TYPE eType = m_pImpl->getDatasourceType(*GetInputSetImpl());
 
         switch ( eType )
         {
-            case DST_ADABAS:
+            case  ::dbaccess::DST_ADABAS:
                 AddTabPage(TAB_PAG_ADABAS_SETTINGS, String(ModuleRes(STR_PAGETITLE_ADABAS_STATISTIC)), ODriversSettings::CreateAdabas,0, sal_False, 1);
                 break;
             default:
@@ -179,7 +179,7 @@ DBG_NAME(OAdabasStatPageDlg)
         return m_pImpl->getDriver();
     }
     // -----------------------------------------------------------------------------
-    DATASOURCE_TYPE OAdabasStatPageDlg::getDatasourceType(const SfxItemSet& _rSet) const
+    ::dbaccess::DATASOURCE_TYPE OAdabasStatPageDlg::getDatasourceType(const SfxItemSet& _rSet) const
     {
         return m_pImpl->getDatasourceType(_rSet);
     }
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 7c1d053825ad..183fb995b04c 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: CollectionView.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.50.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -366,10 +366,17 @@ void OCollectionView::initCurrentPath()
     {
         if ( m_xContent.is() )
         {
-            ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier();
-            const static ::rtl::OUString sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms"));
-            m_bCreateForm = sFormsCID.compareTo(sCID) == 0;
-            m_aFTCurrentPath.SetText(sCID.copy(8));
+            const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier();
+            const static ::rtl::OUString s_sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms"));
+            const static ::rtl::OUString s_sReportsCID(RTL_CONSTASCII_USTRINGPARAM("private:reports"));
+            m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0;
+            ::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM("/"));
+            if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength())
+                sPath = sCID.copy(s_sFormsCID.getLength());
+            else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() )
+                sPath = sCID.copy(s_sReportsCID.getLength());
+
+            m_aFTCurrentPath.SetText(sPath);
             Reference<XChild> xChild(m_xContent,UNO_QUERY);
             bEnable = xChild.is() && Reference<XNameAccess>(xChild->getParent(),UNO_QUERY).is();
         }
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 7872cfae9c29..9c2e2d91fb98 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConnectionHelper.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.48.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
+#include "dsnItem.hxx"
 #ifndef DBAUI_CONNECTIONHELPER_HXX
 #include "ConnectionHelper.hxx"
 #endif
@@ -224,7 +225,7 @@ DBG_NAME(OConnectionHelper)
         BOOL bEnableBrowseButton = m_pCollection->supportsBrowsing(m_eType);
         m_aFT_Connection.Show();
         m_aET_Connection.Show();
-        m_aET_Connection.ShowPrefix(DST_JDBC == m_eType );
+        m_aET_Connection.ShowPrefix( ::dbaccess::DST_JDBC == m_eType );
         m_aPB_Connection.Show(sal_True);
 
         LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE );
@@ -255,7 +256,7 @@ DBG_NAME(OConnectionHelper)
 
         switch ( m_eType )
         {
-        case DST_CALC:
+        case  ::dbaccess::DST_CALC:
             m_pAdminDialog->enableConfirmSettings( getURLNoPrefix().Len() > 0 );
             break;
         default:
@@ -269,8 +270,8 @@ DBG_NAME(OConnectionHelper)
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         switch ( m_eType )
         {
-            case DST_DBASE:
-            case DST_FLAT:
+            case  ::dbaccess::DST_DBASE:
+            case  ::dbaccess::DST_FLAT:
             {
                 try
                 {
@@ -322,7 +323,7 @@ DBG_NAME(OConnectionHelper)
                 }
             }
             break;
-            case DST_CALC:
+            case  ::dbaccess::DST_CALC:
             {
                 ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN
                                                 ,SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_CALC)
@@ -330,7 +331,7 @@ DBG_NAME(OConnectionHelper)
                 askForFileName(aFileDlg);
             }
             break;
-            case DST_MSACCESS:
+            case  ::dbaccess::DST_MSACCESS:
             {
                 ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
                 String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
@@ -340,7 +341,7 @@ DBG_NAME(OConnectionHelper)
                 askForFileName(aFileDlg);
             }
             break;
-            case DST_MSACCESS_2007:
+            case  ::dbaccess::DST_MSACCESS_2007:
             {
                 ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
                 String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
@@ -350,7 +351,7 @@ DBG_NAME(OConnectionHelper)
                 askForFileName(aFileDlg);
             }
             break;
-            case DST_ADABAS:
+            case  ::dbaccess::DST_ADABAS:
             {
                 // collect all names from the config dir
                 // and all dir's of the DBWORK/wrk or DBROOT/wrk dir
@@ -417,7 +418,7 @@ DBG_NAME(OConnectionHelper)
                     if (RET_OK == aSelector.Execute())
                     {
                         setURLNoPrefix(aSelector.GetSelected());
-                        //  checkCreateDatabase(DST_ADABAS);
+                        //  checkCreateDatabase( ::dbaccess::DST_ADABAS);
                         SetRoadmapStateValue(sal_True);
                         callModifiedHdl();
                     }
@@ -431,8 +432,8 @@ DBG_NAME(OConnectionHelper)
                 }
             }
             break;
-            case DST_MYSQL_ODBC:
-            case DST_ODBC:
+            case  ::dbaccess::DST_MYSQL_ODBC:
+            case  ::dbaccess::DST_ODBC:
             {
                 // collect all ODBC data source names
                 ::rtl::OUString sCurrDatasource=getURLNoPrefix();
@@ -448,7 +449,7 @@ DBG_NAME(OConnectionHelper)
             }
             break;
 #ifdef _ADO_DATALINK_BROWSE_
-            case DST_ADO:
+            case  ::dbaccess::DST_ADO:
             {
                 ::rtl::OUString sOldDataSource=getURLNoPrefix();
                 ::rtl::OUString sNewDataSource;
@@ -465,11 +466,11 @@ DBG_NAME(OConnectionHelper)
             }
             break;
 #endif
-            case DST_MOZILLA:
-            case DST_THUNDERBIRD:
+            case  ::dbaccess::DST_MOZILLA:
+            case  ::dbaccess::DST_THUNDERBIRD:
             {
                 MozillaProductType profileType = MozillaProductType_Mozilla;
-                if (m_eType == DST_THUNDERBIRD)
+                if (m_eType ==  ::dbaccess::DST_THUNDERBIRD)
                     profileType = MozillaProductType_Thunderbird;
 
                 Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
@@ -811,11 +812,11 @@ DBG_NAME(OConnectionHelper)
     //-------------------------------------------------------------------------
     long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
     {
-        if (    (DST_DBASE == m_eType)
-            ||  (DST_FLAT == m_eType)
-            ||  (DST_MSACCESS == m_eType)
-            ||  (DST_MSACCESS_2007 == m_eType)
-            ||  (DST_CALC == m_eType) )
+        if (    ( ::dbaccess::DST_DBASE == m_eType)
+            ||  ( ::dbaccess::DST_FLAT == m_eType)
+            ||  ( ::dbaccess::DST_MSACCESS == m_eType)
+            ||  ( ::dbaccess::DST_MSACCESS_2007 == m_eType)
+            ||  ( ::dbaccess::DST_CALC == m_eType) )
             switch (_rNEvt.GetType())
             {
                 case EVENT_GETFOCUS:
@@ -932,11 +933,11 @@ DBG_NAME(OConnectionHelper)
         String sOldPath;
         sOldPath = m_aET_Connection.GetSavedValueNoPrefix();
         sURL = m_aET_Connection.GetTextNoPrefix();
-        if (    (DST_DBASE == m_eType)
-            ||  (DST_FLAT == m_eType)
-            ||  (DST_MSACCESS == m_eType)
-            ||  (DST_MSACCESS_2007 == m_eType)
-            ||  (DST_CALC == m_eType) )
+        if (    ( ::dbaccess::DST_DBASE == m_eType)
+            ||  ( ::dbaccess::DST_FLAT == m_eType)
+            ||  ( ::dbaccess::DST_MSACCESS == m_eType)
+            ||  ( ::dbaccess::DST_MSACCESS_2007 == m_eType)
+            ||  ( ::dbaccess::DST_CALC == m_eType) )
         {
             if ((sURL != sOldPath) && (0 != sURL.Len()))
             {   // the text changed since entering the control
@@ -945,7 +946,7 @@ DBG_NAME(OConnectionHelper)
                 OFileNotation aTransformer(sURL);
                 sURL = aTransformer.get(OFileNotation::N_URL);
 
-                if ( (DST_CALC == m_eType) || (DST_MSACCESS == m_eType) || (DST_MSACCESS_2007 == m_eType) )
+                if ( ( ::dbaccess::DST_CALC == m_eType) || ( ::dbaccess::DST_MSACCESS == m_eType) || ( ::dbaccess::DST_MSACCESS_2007 == m_eType) )
                 { // #106016# --------------------------
                     if( pathExists(sURL, sal_True) == PATH_NOT_EXIST )
                     {
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 6e67f2b92d22..c25751960648 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConnectionHelper.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.66.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -77,13 +77,14 @@ namespace dbaui
         FixedText           m_aFT_Connection;
         OConnectionURLEdit  m_aET_Connection;
         PushButton          m_aPB_Connection;
-        DATASOURCE_TYPE     m_eType;          // the type can't be changed in this class, so we hold it as member.
+        ::dbaccess::DATASOURCE_TYPE
+                            m_eType;          // the type can't be changed in this class, so we hold it as member.
 
     public:
 
         // setting/retrieving the current connection URL
         // necessary because for some types, the URL must be decoded for display purposes
-        ODsnTypeCollection* m_pCollection;  /// the DSN type collection instance
+        ::dbaccess::ODsnTypeCollection* m_pCollection;  /// the DSN type collection instance
         virtual long    PreNotify( NotifyEvent& _rNEvt );
 
         // <method>OGenericAdministrationPage::fillControls</method>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 73755124cecd..9b7f2484cc88 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConnectionPage.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.26.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -155,6 +155,7 @@
 #ifndef _SFX_DOCFILT_HACK_HXX
 #include <sfx2/docfilt.hxx>
 #endif
+#include "dsnItem.hxx"
 #if defined(WIN) || defined(WNT)
 #define _ADO_DATALINK_BROWSE_
 #endif
@@ -248,61 +249,61 @@ namespace dbaui
         LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE );
         switch( m_eType )
         {
-            case DST_DBASE:
+            case  ::dbaccess::DST_DBASE:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_DBASE_PATH_OR_FILE)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_DBASE_PATH);
                 break;
-            case DST_FLAT:
+            case  ::dbaccess::DST_FLAT:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_FLAT_PATH_OR_FILE)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_FLAT_PATH);
                 break;
-            case DST_CALC:
+            case  ::dbaccess::DST_CALC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_CALC_PATH);
                 break;
-            case DST_ADABAS:
+            case  ::dbaccess::DST_ADABAS:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_ADABAS_DATABASE);
                 break;
-            case DST_ADO:
+            case  ::dbaccess::DST_ADO:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL)));
                 break;
-            case DST_MSACCESS:
-            case DST_MSACCESS_2007:
+            case  ::dbaccess::DST_MSACCESS:
+            case  ::dbaccess::DST_MSACCESS_2007:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE);
                 break;
-            case DST_MYSQL_NATIVE:
-            case DST_MYSQL_JDBC:
+            case  ::dbaccess::DST_MYSQL_NATIVE:
+            case  ::dbaccess::DST_MYSQL_JDBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MYSQL_DATABASE_NAME)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_MYSQL_DATABASE);
                 break;
-            case DST_ORACLE_JDBC:
+            case  ::dbaccess::DST_ORACLE_JDBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_ORACLE_DATABASE_NAME)));
                 m_aET_Connection.SetHelpId(HID_DSADMIN_ORACLE_DATABASE);
                 break;
-            case DST_MYSQL_ODBC:
-            case DST_ODBC:
+            case  ::dbaccess::DST_MYSQL_ODBC:
+            case  ::dbaccess::DST_ODBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE)));
-                m_aET_Connection.SetHelpId( m_eType == DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE);
+                m_aET_Connection.SetHelpId( m_eType ==  ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE);
                 break;
-            case DST_LDAP:
+            case  ::dbaccess::DST_LDAP:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_HOSTNAME)));
                 m_aET_Connection.SetHelpId( HID_DSADMIN_LDAP_HOSTNAME );
                 break;
-            case DST_MOZILLA:
+            case  ::dbaccess::DST_MOZILLA:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_MOZILLA_PROFILE_NAME)));
                 m_aET_Connection.SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME );
                 break;
-            case DST_THUNDERBIRD:
+            case  ::dbaccess::DST_THUNDERBIRD:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME)));
                 m_aET_Connection.SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME );
                 break;
-            case DST_OUTLOOK:
-            case DST_OUTLOOKEXP:
-            case DST_EVOLUTION:
-            case DST_KAB:
-            case DST_MACAB:
+            case  ::dbaccess::DST_OUTLOOK:
+            case  ::dbaccess::DST_OUTLOOKEXP:
+            case  ::dbaccess::DST_EVOLUTION:
+            case  ::dbaccess::DST_KAB:
+            case  ::dbaccess::DST_MACAB:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_NO_ADDITIONAL_SETTINGS)));
                 {
                     String sText = m_aFT_Connection.GetText();
@@ -313,7 +314,7 @@ namespace dbaui
                 }
                 m_aET_Connection.Hide();
                 break;
-            case DST_JDBC:
+            case  ::dbaccess::DST_JDBC:
                 m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL)));
                 // run through
             default:
@@ -350,7 +351,7 @@ namespace dbaui
             String sUrl = pUrlItem->GetValue();
             setURL( sUrl );
 
-            BOOL bEnableJDBC = m_eType == DST_JDBC;
+            BOOL bEnableJDBC = m_eType ==  ::dbaccess::DST_JDBC;
             m_aJavaDriver.SetText(pJdbcDrvItem->GetValue());
 
             m_aJavaDriverLabel.Show(bEnableJDBC);
@@ -404,7 +405,7 @@ namespace dbaui
 
         fillBool(_rSet,&m_aPasswordRequired,DSID_PASSWORDREQUIRED,bChangedSomething);
 
-        if ( m_eType == DST_JDBC )
+        if ( m_eType ==  ::dbaccess::DST_JDBC )
         {
             fillString(_rSet,&m_aJavaDriver, DSID_JDBCDRIVERCLASS, bChangedSomething);
         }
@@ -440,7 +441,7 @@ namespace dbaui
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
         BOOL bEnableTestConnection = !m_aET_Connection.IsVisible() || (m_aET_Connection.GetTextNoPrefix().Len() != 0);
-        if ( m_eType == DST_JDBC )
+        if ( m_eType ==  ::dbaccess::DST_JDBC )
             bEnableTestConnection = bEnableTestConnection && (m_aJavaDriver.GetText().Len() != 0);
         m_aTestConnection.Enable(bEnableTestConnection);
         return true;
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 89a155a45bc6..c9ae69e57278 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConnectionPage.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -58,7 +58,8 @@ namespace dbaui
     */
     class OConnectionTabPage : public OConnectionHelper
     {
-        ODsnTypeCollection* m_pCollection;  /// the DSN type collection instance
+        ::dbaccess::ODsnTypeCollection*
+                            m_pCollection;  /// the DSN type collection instance
         sal_Bool            m_bUserGrabFocus : 1;
     protected:
         // connection
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index ed344f53fc43..18897b83f088 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConnectionPageSetup.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -272,12 +272,12 @@ namespace dbaui
         m_eType = m_pAdminDialog->getDatasourceType(_rSet);
         // special handling for oracle, this can only happen
         // if the user enters the same url as used for Oracle and we are on the JDBC path
-        if ( DST_ORACLE_JDBC == m_eType )
-            m_eType = DST_JDBC;
+        if (  ::dbaccess::DST_ORACLE_JDBC == m_eType )
+            m_eType =  ::dbaccess::DST_JDBC;
 
         OConnectionHelper::implInitControls(_rSet, _bSaveValue);
 
-        if ( m_eType >= DST_USERDEFINE1 )
+        if ( m_eType >=  ::dbaccess::DST_USERDEFINE1 )
         {
             String sDisplayName = m_pCollection->getTypeDisplayName(m_eType);
             FixedText* ppTextControls[] ={&m_aFT_Connection};
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 34339bfecef8..129c2cdd216a 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DBSetupConnectionPages.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,6 +60,7 @@
 #ifndef _DBAUI_DATASOURCEITEMS_HXX_
 #include "dsitems.hxx"
 #endif
+#include "dsnItem.hxx"
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
@@ -282,12 +283,12 @@ DBG_NAME(OTextConnectionPageSetup)
         if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() )
         {
             DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
-            ODsnTypeCollection* pCollection = NULL;
+            ::dbaccess::ODsnTypeCollection* pCollection = NULL;
             if (pCollectionItem)
                 pCollection = pCollectionItem->getCollection();
             DBG_ASSERT(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !");
 
-            String sUrl = pCollection->getDatasourcePrefix(DST_LDAP);
+            String sUrl = pCollection->getDatasourcePrefix( ::dbaccess::DST_LDAP);
             sUrl += m_aETHostServer.GetText();
             _rSet.Put(SfxStringItem(DSID_CONNECTURL, sUrl));
             bChangedSomething = sal_True;
@@ -388,11 +389,11 @@ DBG_NAME(OMySQLIntroPageSetup)
     void OMySQLIntroPageSetup::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bSaveValue*/)
     {
         DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
-        ODsnTypeCollection* pCollection = NULL;
+        ::dbaccess::ODsnTypeCollection* pCollection = NULL;
         if (pCollectionItem)
         {
             pCollection = pCollectionItem->getCollection();
-            String sUrl = pCollection->getDatasourcePrefix(DST_MYSQL_NATIVE);
+            String sUrl = pCollection->getDatasourcePrefix( ::dbaccess::DST_MYSQL_NATIVE);
             uno::Reference< sdbc::XDriverAccess > xDriverManager( m_xORB->createInstance( SERVICE_SDBC_DRIVERMANAGER ), uno::UNO_QUERY );
             if ( xDriverManager.is() && xDriverManager->getDriverByURL( sUrl ).is() )
             {
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 4a4497d669d2..779814ca508b 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DbAdminImpl.cxx,v $
- * $Revision: 1.26 $
+ * $Revision: 1.26.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -119,7 +119,7 @@
 #ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
 #include <com/sun/star/frame/XStorable.hpp>
 #endif
-
+#include "dsnItem.hxx"
 
 #include <algorithm>
 #include <functional>
@@ -471,19 +471,19 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc
     return m_xDatasource;
 }
 //-------------------------------------------------------------------------
-DATASOURCE_TYPE ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& _rSet )
+::dbaccess::DATASOURCE_TYPE ODbDataSourceAdministrationHelper::getDatasourceType( const SfxItemSet& _rSet )
 {
     SFX_ITEMSET_GET( _rSet, pConnectURL, SfxStringItem, DSID_CONNECTURL, sal_True );
     SFX_ITEMSET_GET( _rSet, pTypeCollection, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True );
     DBG_ASSERT( pConnectURL && pTypeCollection, "ODbDataSourceAdministrationHelper::getDatasourceType: invalid items in the source set!" );
     if ( !pConnectURL || !pTypeCollection )
-        return DST_UNKNOWN;
+        return  ::dbaccess::DST_UNKNOWN;
 
     String sConnectURL = pConnectURL->GetValue();
-    ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
+    ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
     DBG_ASSERT( pCollection, "ODbDataSourceAdministrationHelper::getDatasourceType: invalid type collection!" );
     if ( !pCollection )
-        return DST_UNKNOWN;
+        return  ::dbaccess::DST_UNKNOWN;
 
     return pCollection->getType( sConnectURL );
 }
@@ -498,25 +498,25 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
 {
     String sNewUrl;
 
-    DATASOURCE_TYPE eType = getDatasourceType(*m_pItemSetHelper->getOutputSet());
+    ::dbaccess::DATASOURCE_TYPE eType = getDatasourceType(*m_pItemSetHelper->getOutputSet());
 
     SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True);
     SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pTypeCollection, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
 
     OSL_ENSURE(pUrlItem,"Connection URL is NULL. -> GPF!");
     DBG_ASSERT(pTypeCollection, "ODbDataSourceAdministrationHelper::getDatasourceType: invalid items in the source set!");
-    ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
+    ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
     DBG_ASSERT(pCollection, "ODbDataSourceAdministrationHelper::getDatasourceType: invalid type collection!");
 
 
 
     switch( eType )
     {
-        case DST_DBASE:
-        case DST_FLAT:
-        case DST_CALC:
+        case  ::dbaccess::DST_DBASE:
+        case  ::dbaccess::DST_FLAT:
+        case  ::dbaccess::DST_CALC:
             break;
-        case DST_ADABAS:
+        case  ::dbaccess::DST_ADABAS:
             {
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 sNewUrl = lcl_createHostWithPort(pHostName,NULL);
@@ -527,8 +527,8 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 sNewUrl += sUrl;
             }
             break;
-        case DST_MSACCESS:
-        case DST_MSACCESS_2007:
+        case  ::dbaccess::DST_MSACCESS:
+        case  ::dbaccess::DST_MSACCESS_2007:
             {
                 ::rtl::OUString sFileName = pCollection->cutPrefix(pUrlItem->GetValue());
                 ::rtl::OUString sNewFileName;
@@ -538,8 +538,8 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 }
             }
             break;
-        case DST_MYSQL_NATIVE:
-        case DST_MYSQL_JDBC:
+        case  ::dbaccess::DST_MYSQL_NATIVE:
+        case  ::dbaccess::DST_MYSQL_JDBC:
             {
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_MYSQL_PORTNUMBER, sal_True);
@@ -559,7 +559,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 }
             }
             break;
-        case DST_ORACLE_JDBC:
+        case  ::dbaccess::DST_ORACLE_JDBC:
             {
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_ORACLE_PORTNUMBER, sal_True);
@@ -583,7 +583,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 }
             }
             break;
-        case DST_LDAP:
+        case  ::dbaccess::DST_LDAP:
             {
                 //  SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
                 SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
@@ -591,7 +591,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
                 sNewUrl += lcl_createHostWithPort(NULL,pPortNumber);
             }
             break;
-        case DST_JDBC:
+        case  ::dbaccess::DST_JDBC:
             // run through
         default:
             break;
@@ -769,7 +769,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
     // us)
 
     // first determine which of all the items are relevant for the data source (depends on the connection url)
-    DATASOURCE_TYPE eType = getDatasourceType(_rSource);
+    ::dbaccess::DATASOURCE_TYPE eType = getDatasourceType(_rSource);
     ::std::vector< sal_Int32> aDetailIds;
     ODriversSettings::getSupportedIndirectSettings(eType,aDetailIds);
 
@@ -874,7 +874,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
     }
 
     // here we have a special entry for types from oracle
-    if ( eType == DST_ORACLE_JDBC )
+    if ( eType ==  ::dbaccess::DST_ORACLE_JDBC )
     {
         Sequence< Any > aTypeSettings;
         static const ::rtl::OUString s_sCondition(RTL_CONSTASCII_USTRINGPARAM("Column(2) = "));
@@ -1077,14 +1077,14 @@ String ODbDataSourceAdministrationHelper::getDocumentUrl(SfxItemSet& _rDest)
 // -----------------------------------------------------------------------------
 void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
 {
-    DATASOURCE_TYPE eType = getDatasourceType(_rDest);
+    ::dbaccess::DATASOURCE_TYPE eType = getDatasourceType(_rDest);
 
     SFX_ITEMSET_GET(_rDest, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True);
     SFX_ITEMSET_GET(_rDest, pTypeCollection, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
 
     OSL_ENSURE(pUrlItem,"Connection URL is NULL. -> GPF!");
     DBG_ASSERT(pTypeCollection, "ODbAdminDialog::getDatasourceType: invalid items in the source set!");
-    ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
+    ::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
     DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
 
     USHORT nPortNumberId    = 0;
@@ -1097,14 +1097,14 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
 
     switch( eType )
     {
-        case DST_MYSQL_NATIVE:
-        case DST_MYSQL_JDBC:
+        case  ::dbaccess::DST_MYSQL_NATIVE:
+        case  ::dbaccess::DST_MYSQL_JDBC:
             nPortNumberId = DSID_MYSQL_PORTNUMBER;
             break;
-        case DST_ORACLE_JDBC:
+        case  ::dbaccess::DST_ORACLE_JDBC:
             nPortNumberId = DSID_ORACLE_PORTNUMBER;
             break;
-        case DST_LDAP:
+        case  ::dbaccess::DST_LDAP:
             nPortNumberId = DSID_CONN_LDAP_PORTNUMBER;
             break;
         default:
@@ -1144,6 +1144,37 @@ void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSo
         // hmm. We could reset m_xDatasource/m_xModel, probably, and continue working
     m_aDataSourceOrName = _rDataSourceOrName;
 }
+//=========================================================================
+//= DbuTypeCollectionItem
+//=========================================================================
+TYPEINIT1(DbuTypeCollectionItem, SfxPoolItem);
+//-------------------------------------------------------------------------
+DbuTypeCollectionItem::DbuTypeCollectionItem(sal_Int16 _nWhich, ::dbaccess::ODsnTypeCollection* _pCollection)
+    :SfxPoolItem(_nWhich)
+    ,m_pCollection(_pCollection)
+{
+}
+
+//-------------------------------------------------------------------------
+DbuTypeCollectionItem::DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource)
+    :SfxPoolItem(_rSource)
+    ,m_pCollection(_rSource.getCollection())
+{
+}
+
+//-------------------------------------------------------------------------
+int DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const
+{
+    DbuTypeCollectionItem* pCompare = PTR_CAST(DbuTypeCollectionItem, &_rItem);
+    return pCompare && (pCompare->getCollection() == getCollection());
+}
+
+//-------------------------------------------------------------------------
+SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const
+{
+    return new DbuTypeCollectionItem(*this);
+}
+
 //.........................................................................
 }   // namespace dbaui
 //.........................................................................
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 78ac41d9ffb7..70a0c07a6722 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DbAdminImpl.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -64,6 +64,7 @@
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
 #include <com/sun/star/frame/XModel.hpp>
 #endif
+#include <svtools/poolitem.hxx>
 
 class Window;
 //.........................................................................
@@ -141,7 +142,7 @@ namespace dbaui
         /** extracts the connection type from the given set<p/>
             The connection type is determined by the value of the DSN item, analyzed by the TypeCollection item.
         */
-        static DATASOURCE_TYPE  getDatasourceType( const SfxItemSet& _rSet );
+        static ::dbaccess::DATASOURCE_TYPE  getDatasourceType( const SfxItemSet& _rSet );
 
         /** returns the connection URL
             @return
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 24e3342c4e5e..d9ae183a0c7a 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DriverSettings.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,7 +37,7 @@
 
 
 using namespace dbaui;
-void ODriversSettings::getSupportedIndirectSettings( DATASOURCE_TYPE _eType, ::std::vector< sal_Int32>& _out_rDetailsIds )
+void ODriversSettings::getSupportedIndirectSettings( ::dbaccess::DATASOURCE_TYPE _eType, ::std::vector< sal_Int32>& _out_rDetailsIds )
 {
     // for a number of settings, we do not need to use hard-coded here, but can ask a
     // central DataSourceUI instance.
@@ -68,12 +68,12 @@ void ODriversSettings::getSupportedIndirectSettings( DATASOURCE_TYPE _eType, ::s
     // the rest is hard-coded. On the long run, all of this should be done via DataSourceUI::hasSetting
     switch ( _eType )
     {
-        case DST_DBASE:
+        case  ::dbaccess::DST_DBASE:
             _out_rDetailsIds.push_back(DSID_SHOWDELETEDROWS);
             _out_rDetailsIds.push_back(DSID_CHARSET);
             break;
 
-        case DST_FLAT:
+        case  ::dbaccess::DST_FLAT:
             _out_rDetailsIds.push_back(DSID_FIELDDELIMITER);
             _out_rDetailsIds.push_back(DSID_TEXTDELIMITER);
             _out_rDetailsIds.push_back(DSID_DECIMALDELIMITER);
@@ -83,7 +83,7 @@ void ODriversSettings::getSupportedIndirectSettings( DATASOURCE_TYPE _eType, ::s
             _out_rDetailsIds.push_back(DSID_CHARSET);
             break;
 
-        case DST_ADABAS:
+        case  ::dbaccess::DST_ADABAS:
             _out_rDetailsIds.push_back(DSID_CHARSET);
             _out_rDetailsIds.push_back(DSID_CONN_SHUTSERVICE);
             _out_rDetailsIds.push_back(DSID_CONN_DATAINC);
@@ -92,40 +92,40 @@ void ODriversSettings::getSupportedIndirectSettings( DATASOURCE_TYPE _eType, ::s
             _out_rDetailsIds.push_back(DSID_CONN_CTRLPWD);
             break;
 
-        case DST_ADO:
+        case  ::dbaccess::DST_ADO:
             _out_rDetailsIds.push_back(DSID_CHARSET);
             break;
 
-        case DST_ODBC:
+        case  ::dbaccess::DST_ODBC:
             _out_rDetailsIds.push_back(DSID_ADDITIONALOPTIONS);
             _out_rDetailsIds.push_back(DSID_CHARSET);
             _out_rDetailsIds.push_back(DSID_USECATALOG);
             break;
 
-        case DST_MYSQL_NATIVE:
+        case  ::dbaccess::DST_MYSQL_NATIVE:
             _out_rDetailsIds.push_back(DSID_CHARSET);
             _out_rDetailsIds.push_back(DSID_CONN_SOCKET);
             break;
-        case DST_MYSQL_JDBC:
+        case  ::dbaccess::DST_MYSQL_JDBC:
             _out_rDetailsIds.push_back(DSID_CHARSET);
             _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS);
             break;
 
-        case DST_MYSQL_ODBC:
+        case  ::dbaccess::DST_MYSQL_ODBC:
             _out_rDetailsIds.push_back(DSID_CHARSET);
             break;
 
-        case DST_LDAP:
+        case  ::dbaccess::DST_LDAP:
             _out_rDetailsIds.push_back(DSID_CONN_LDAP_BASEDN);
             _out_rDetailsIds.push_back(DSID_CONN_LDAP_ROWCOUNT);
             _out_rDetailsIds.push_back(DSID_CONN_LDAP_USESSL);
             break;
 
-        case DST_JDBC:
+        case  ::dbaccess::DST_JDBC:
             _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS);
             break;
 
-        case DST_ORACLE_JDBC:
+        case  ::dbaccess::DST_ORACLE_JDBC:
             _out_rDetailsIds.push_back(DSID_JDBCDRIVERCLASS);
             _out_rDetailsIds.push_back(DSID_IGNORECURRENCY);
             break;
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index d6953e2bb958..29a68d35a5a5 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DriverSettings.hxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,6 +33,7 @@
 #ifndef _DBAUI_DSNTYPES_HXX_
 #include "dsntypes.hxx"
 #endif
+#include <svtools/poolitem.hxx>
 #include <vector>
 
 class SfxTabPage;
@@ -52,7 +53,7 @@ namespace dbaui
             @param  _out_rDetailsIds
                 Will be filled.
         */
-        static void getSupportedIndirectSettings( DATASOURCE_TYPE _eType,::std::vector< sal_Int32>& _out_rDetailsIds );
+        static void getSupportedIndirectSettings( ::dbaccess::DATASOURCE_TYPE _eType,::std::vector< sal_Int32>& _out_rDetailsIds );
 
         /** Creates the detail page for Dbase
         */
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index ed054fd909fc..0a02981858ee 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: RelationDlg.cxx,v $
- * $Revision: 1.29 $
+ * $Revision: 1.29.24.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -246,7 +246,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
     try
     {
         ORelationTableConnectionData* pOrigConnData = static_cast<ORelationTableConnectionData*>(m_pOrigConnData.get());
-        if (*pConnData != *pOrigConnData || pConnData->Update())
+        if ( *pConnData == *pOrigConnData || pConnData->Update())
         {
             m_pOrigConnData->CopyFrom( *m_pConnData );
             EndDialog( RET_OK );
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 8ce378b453b5..bc070485fea2 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: UserAdminDlg.cxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.14.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -228,7 +228,7 @@ DBG_NAME(OUserAdminDlg)
         return m_pImpl->getDriver();
     }
     // -----------------------------------------------------------------------------
-    DATASOURCE_TYPE OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const
+    ::dbaccess::DATASOURCE_TYPE OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const
     {
         return m_pImpl->getDatasourceType(_rSet);
     }
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 4dd216e32ea8..a6fbd46ba6b0 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: adminpages.cxx,v $
- * $Revision: 1.52 $
+ * $Revision: 1.52.40.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -183,7 +183,7 @@ namespace dbaui
         return 0L;
     }
     // -----------------------------------------------------------------------
-    sal_Bool OGenericAdministrationPage::getSelectedDataSource(DATASOURCE_TYPE _eType,::rtl::OUString& _sReturn,::rtl::OUString& _sCurr)
+    sal_Bool OGenericAdministrationPage::getSelectedDataSource(::dbaccess::DATASOURCE_TYPE _eType,::rtl::OUString& _sReturn,::rtl::OUString& _sCurr)
     {
         // collect all ODBC data source names
         StringBag aOdbcDatasources;
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 11dc24a42614..d1ef46a37cf1 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: adminpages.hxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.35.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -166,7 +166,7 @@ namespace dbaui
             @return
                 <FALSE/> if an error occured, otherwise <TRUE/>
         */
-        sal_Bool getSelectedDataSource(DATASOURCE_TYPE _eType,::rtl::OUString& _sReturn,::rtl::OUString& _sCurr);
+        sal_Bool getSelectedDataSource(::dbaccess::DATASOURCE_TYPE _eType,::rtl::OUString& _sReturn,::rtl::OUString& _sCurr);
 
         // svt::IWizardPage
         virtual void initializePage();
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 081a42d069fb..d5ce1cdd47e5 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: adtabdlg.cxx,v $
- * $Revision: 1.30 $
+ * $Revision: 1.30.68.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -30,74 +30,36 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
-#ifndef DBAUI_QYDLGTAB_HXX
+
 #include "adtabdlg.hxx"
-#endif
-#ifndef DBAUI_ADTABDLG_HRC
 #include "adtabdlg.hrc"
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HXX_
 #include "sqlmessage.hxx"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
-#ifndef TOOLS_DIAGNOSE_EX_H
 #include <tools/diagnose_ex.h>
-#endif
-#ifndef _SVTOOLS_LOCALRESACCESS_HXX_
 #include <svtools/localresaccess.hxx>
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_RESOURCE_HRC_
 #include "dbu_resource.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
 #include "dbu_dlg.hrc"
-#endif
-#ifndef _SFXSIDS_HRC
 #include <sfx2/sfxsids.hrc>
-#endif
-#ifndef DBAUI_QUERYTABLEVIEW_HXX
 #include "QueryTableView.hxx"
-#endif
-#ifndef DBAUI_QUERYDESIGNVIEW_HXX
 #include "QueryDesignView.hxx"
-#endif
-#ifndef DBAUI_QUERYCONTROLLER_HXX
 #include "querycontroller.hxx"
-#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
 #include <connectivity/dbtools.hxx>
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
-#endif
-#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
 #include <com/sun/star/container/XNameAccess.hpp>
-#endif
-#ifndef DBAUI_TOOLS_HXX
 #include "UITools.hxx"
-#endif
-#ifndef DBACCESS_IMAGEPROVIDER_HXX
 #include "imageprovider.hxx"
-#endif
 
+#include <comphelper/containermultiplexer.hxx>
+#include "cppuhelper/basemutex.hxx"
 #include <algorithm>
 
 // slot ids
 using namespace dbaui;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::sdb;
@@ -115,23 +77,42 @@ TableObjectListFacade::~TableObjectListFacade()
 //==============================================================================
 //= TableListFacade
 //==============================================================================
-class TableListFacade : public TableObjectListFacade
+class TableListFacade : public ::cppu::BaseMutex
+                    ,   public TableObjectListFacade
+                    ,   public ::comphelper::OContainerListener
 {
     OTableTreeListBox&          m_rTableList;
     Reference< XConnection >    m_xConnection;
+    ::rtl::Reference< comphelper::OContainerListenerAdapter>
+                                m_pContainerListener;
+    bool                        m_bAllowViews;
 
 public:
     TableListFacade( OTableTreeListBox& _rTableList, const Reference< XConnection >& _rxConnection )
-        :m_rTableList( _rTableList )
+        : ::comphelper::OContainerListener(m_aMutex)
+        ,m_rTableList( _rTableList )
         ,m_xConnection( _rxConnection )
+        ,m_bAllowViews(true)
     {
     }
+    virtual ~TableListFacade();
+
 
+private:
     virtual void    updateTableObjectList( bool _bAllowViews );
     virtual String  getSelectedName( String& _out_rAliasName ) const;
     virtual bool    isLeafSelected() const;
+    // OContainerListener
+    virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void _elementRemoved( const  ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
 };
 
+TableListFacade::~TableListFacade()
+{
+    if ( m_pContainerListener.is() )
+        m_pContainerListener->dispose();
+}
 //------------------------------------------------------------------------------
 String TableListFacade::getSelectedName( String& _out_rAliasName ) const
 {
@@ -174,21 +155,44 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const
     _out_rAliasName = aTableName;
     return aComposedName;
 }
-
+// -----------------------------------------------------------------------------
+void TableListFacade::_elementInserted( const container::ContainerEvent& /*_rEvent*/ )  throw(::com::sun::star::uno::RuntimeException)
+{
+    updateTableObjectList(m_bAllowViews);
+}
+// -----------------------------------------------------------------------------
+void TableListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
+{
+    updateTableObjectList(m_bAllowViews);
+}
+// -----------------------------------------------------------------------------
+void TableListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
+{
+}
 //------------------------------------------------------------------------------
 void TableListFacade::updateTableObjectList( bool _bAllowViews )
 {
+    m_bAllowViews = _bAllowViews;
     m_rTableList.Clear();
     try
     {
         Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW );
+
         Reference< XViewsSupplier > xViewSupp;
         Reference< XNameAccess > xTables, xViews;
         Sequence< ::rtl::OUString > sTables, sViews;
 
         xTables = xTableSupp->getTables();
         if ( xTables.is() )
+        {
+            if ( !m_pContainerListener.is() )
+            {
+                Reference< XContainer> xContainer(xTables,uno::UNO_QUERY);
+                if ( xContainer.is() )
+                    m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
+            }
             sTables = xTables->getElementNames();
+        } // if ( xTables.is() )
 
         xViewSupp.set( xTableSupp, UNO_QUERY );
         if ( xViewSupp.is() )
@@ -241,22 +245,53 @@ bool TableListFacade::isLeafSelected() const
 //==============================================================================
 //= QueryListFacade
 //==============================================================================
-class QueryListFacade : public TableObjectListFacade
+class QueryListFacade : public ::cppu::BaseMutex
+                    ,   public TableObjectListFacade
+                    ,   public ::comphelper::OContainerListener
 {
     SvTreeListBox&              m_rQueryList;
     Reference< XConnection >    m_xConnection;
+    ::rtl::Reference< comphelper::OContainerListenerAdapter>
+                                m_pContainerListener;
 
 public:
     QueryListFacade( SvTreeListBox& _rQueryList, const Reference< XConnection >& _rxConnection )
-        :m_rQueryList( _rQueryList )
+        : ::comphelper::OContainerListener(m_aMutex)
+        ,m_rQueryList( _rQueryList )
         ,m_xConnection( _rxConnection )
     {
     }
-
+    virtual ~QueryListFacade();
+private:
     virtual void    updateTableObjectList( bool _bAllowViews );
     virtual String  getSelectedName( String& _out_rAliasName ) const;
     virtual bool    isLeafSelected() const;
+    // OContainerListener
+    virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void _elementRemoved( const  ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException);
 };
+QueryListFacade::~QueryListFacade()
+{
+    if ( m_pContainerListener.is() )
+        m_pContainerListener->dispose();
+}
+// -----------------------------------------------------------------------------
+void QueryListFacade::_elementInserted( const container::ContainerEvent& _rEvent )  throw(::com::sun::star::uno::RuntimeException)
+{
+    ::rtl::OUString sName;
+    if ( _rEvent.Accessor >>= sName )
+        m_rQueryList.InsertEntry( sName );
+}
+// -----------------------------------------------------------------------------
+void QueryListFacade::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
+{
+    updateTableObjectList(true);
+}
+// -----------------------------------------------------------------------------
+void QueryListFacade::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
+{
+}
 
 //------------------------------------------------------------------------------
 void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
@@ -275,6 +310,11 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
 
         Reference< XQueriesSupplier > xSuppQueries( m_xConnection, UNO_QUERY_THROW );
         Reference< XNameAccess > xQueries( xSuppQueries->getQueries(), UNO_QUERY_THROW );
+        if ( !m_pContainerListener.is() )
+        {
+            Reference< XContainer> xContainer(xQueries,UNO_QUERY_THROW);
+            m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
+        }
         Sequence< ::rtl::OUString > aQueryNames = xQueries->getElementNames();
 
         const ::rtl::OUString* pQuery = aQueryNames.getConstArray();
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 89116e4feab8..ffc6e1cb8080 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: advancedsettings.cxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -408,7 +408,7 @@ namespace dbaui
         delete pExampleSet;
         pExampleSet = new SfxItemSet(*GetInputSetImpl());
 
-        DATASOURCE_TYPE eType = m_pImpl->getDatasourceType(*_pItems);
+        ::dbaccess::DATASOURCE_TYPE eType = m_pImpl->getDatasourceType(*_pItems);
 
         DataSourceMetaData aMeta( eType );
         const AdvancedSettingsSupport& rAdvancedSupport( aMeta.getAdvancedSettingsSupport() );
@@ -434,7 +434,7 @@ namespace dbaui
     }
 
     // -----------------------------------------------------------------------
-    bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( DATASOURCE_TYPE _eType )
+    bool AdvancedSettingsDialog::doesHaveAnyAdvancedSettings( ::dbaccess::DATASOURCE_TYPE _eType )
     {
         DataSourceMetaData aMeta( _eType );
         const AdvancedSettingsSupport& rSupport( aMeta.getAdvancedSettingsSupport() );
@@ -501,7 +501,7 @@ namespace dbaui
     }
 
     // -----------------------------------------------------------------------------
-    DATASOURCE_TYPE AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const
+    ::dbaccess::DATASOURCE_TYPE AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const
     {
         return m_pImpl->getDatasourceType(_rSet);
     }
diff --git a/dbaccess/source/ui/dlg/datasourceui.cxx b/dbaccess/source/ui/dlg/datasourceui.cxx
index 7cde64deeca3..a255222c13b3 100644
--- a/dbaccess/source/ui/dlg/datasourceui.cxx
+++ b/dbaccess/source/ui/dlg/datasourceui.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: datasourceui.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -52,7 +52,7 @@ namespace dbaui
     //= DataSourceUI
     //====================================================================
     //--------------------------------------------------------------------
-    DataSourceUI::DataSourceUI( DATASOURCE_TYPE _eType )
+    DataSourceUI::DataSourceUI( ::dbaccess::DATASOURCE_TYPE _eType )
         :m_aDSMeta( DataSourceMetaData( _eType ) )
     {
     }
diff --git a/dbaccess/source/ui/dlg/datasourceui.hxx b/dbaccess/source/ui/dlg/datasourceui.hxx
index 59759e9dea66..9fa356503ed4 100644
--- a/dbaccess/source/ui/dlg/datasourceui.hxx
+++ b/dbaccess/source/ui/dlg/datasourceui.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: datasourceui.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -52,7 +52,7 @@ namespace dbaui
     class DataSourceUI
     {
     public:
-        DataSourceUI( DATASOURCE_TYPE _eType );
+        DataSourceUI( ::dbaccess::DATASOURCE_TYPE _eType );
         DataSourceUI( const DataSourceMetaData& _rDSMeta );
         ~DataSourceUI();
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 2961078207ba..dbcf11dc0fc5 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbadmin.cxx,v $
- * $Revision: 1.108 $
+ * $Revision: 1.108.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
+#include "dsnItem.hxx"
 #ifndef _DBAUI_DBADMIN_HXX_
 #include "dbadmin.hxx"
 #endif
@@ -181,43 +182,43 @@ void ODbAdminDialog::implSelectDatasource(const ::com::sun::star::uno::Any& _aDa
     Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
     resetPages(xDatasource);
 
-    DATASOURCE_TYPE eType = getDatasourceType(*getOutputSet());
+    ::dbaccess::DATASOURCE_TYPE eType = getDatasourceType(*getOutputSet());
 
     // and insert the new ones
     switch ( eType )
     {
-        case DST_DBASE:
+        case  ::dbaccess::DST_DBASE:
             addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase);
             //  bResetPasswordRequired = sal_True;
             break;
 
-        case DST_ADO:
+        case  ::dbaccess::DST_ADO:
             addDetailPage(PAGE_ADO, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateAdo);
             break;
 
-        case DST_FLAT:
+        case  ::dbaccess::DST_FLAT:
             addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText);
             //  bResetPasswordRequired = sal_True;
             break;
 
-        case DST_ODBC:
+        case  ::dbaccess::DST_ODBC:
             addDetailPage(PAGE_ODBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateODBC);
             break;
 
-        case DST_MYSQL_ODBC:
+        case  ::dbaccess::DST_MYSQL_ODBC:
             addDetailPage(PAGE_MYSQL_ODBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateMySQLODBC);
             break;
-        case DST_MYSQL_JDBC:
+        case  ::dbaccess::DST_MYSQL_JDBC:
             addDetailPage(PAGE_MYSQL_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateMySQLJDBC);
             break;
-        case DST_MYSQL_NATIVE:
+        case  ::dbaccess::DST_MYSQL_NATIVE:
             addDetailPage(PAGE_MYSQL_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateMySQLNATIVE);
             break;
-        case DST_ORACLE_JDBC:
+        case  ::dbaccess::DST_ORACLE_JDBC:
             addDetailPage(PAGE_ORACLE_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateOracleJDBC);
             break;
 
-        case DST_ADABAS:
+        case  ::dbaccess::DST_ADABAS:
             // for adabas we have more than one page
             // CAUTION: the order of inserting pages matters.
             // the major detail page should be inserted last always (thus, it becomes the first page after
@@ -225,19 +226,19 @@ void ODbAdminDialog::implSelectDatasource(const ::com::sun::star::uno::Any& _aDa
             addDetailPage(PAGE_ADABAS, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateAdabas);
             break;
 
-        case DST_LDAP:
+        case  ::dbaccess::DST_LDAP:
             addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP);
             break;
-        case DST_USERDEFINE1:   /// first user defined driver
-        case DST_USERDEFINE2:
-        case DST_USERDEFINE3:
-        case DST_USERDEFINE4:
-        case DST_USERDEFINE5:
-        case DST_USERDEFINE6:
-        case DST_USERDEFINE7:
-        case DST_USERDEFINE8:
-        case DST_USERDEFINE9:
-        case DST_USERDEFINE10:
+        case  ::dbaccess::DST_USERDEFINE1:  /// first user defined driver
+        case  ::dbaccess::DST_USERDEFINE2:
+        case  ::dbaccess::DST_USERDEFINE3:
+        case  ::dbaccess::DST_USERDEFINE4:
+        case  ::dbaccess::DST_USERDEFINE5:
+        case  ::dbaccess::DST_USERDEFINE6:
+        case  ::dbaccess::DST_USERDEFINE7:
+        case  ::dbaccess::DST_USERDEFINE8:
+        case  ::dbaccess::DST_USERDEFINE9:
+        case  ::dbaccess::DST_USERDEFINE10:
             {
                 LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG);
                 String aTitle(ModuleRes(STR_PAGETITLE_ADVANCED));
@@ -385,7 +386,7 @@ Reference< XDriver > ODbAdminDialog::getDriver()
     return m_pImpl->getDriver();
 }
 // -----------------------------------------------------------------------------
-DATASOURCE_TYPE ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const
+::dbaccess::DATASOURCE_TYPE ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const
 {
     return m_pImpl->getDatasourceType(_rSet);
 }
@@ -395,7 +396,7 @@ void ODbAdminDialog::clearPassword()
     m_pImpl->clearPassword();
 }
 //-------------------------------------------------------------------------
-SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ODsnTypeCollection* _pTypeCollection)
+SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection)
 {
     // just to be sure ....
     _rpSet = NULL;
@@ -408,7 +409,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
     SfxPoolItem** pCounter = _rppDefaults;  // want to modify this without affecting the out param _rppDefaults
     *pCounter++ = new SfxStringItem(DSID_NAME, String());
     *pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String());
-    *pCounter++ = new SfxStringItem(DSID_CONNECTURL, _pTypeCollection ? _pTypeCollection->getDatasourcePrefix( DST_ADABAS ) : String());
+    *pCounter++ = new SfxStringItem(DSID_CONNECTURL, _pTypeCollection ? _pTypeCollection->getDatasourcePrefix(  ::dbaccess::DST_ADABAS ) : String());
     *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< ::rtl::OUString >(&sFilterAll, 1));
     *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection);
     *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False);
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 2f5ddfb15ddb..ae2e827616ac 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbwiz.cxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.21.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -169,12 +169,12 @@ IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
     m_eType = _pTabPage->GetSelectedType();
     switch(m_eType)
     {
-        case DST_MOZILLA:
-        case DST_OUTLOOK:
-        case DST_OUTLOOKEXP:
-        case DST_EVOLUTION:
-        case DST_KAB:
-        case DST_MACAB:
+        case  ::dbaccess::DST_MOZILLA:
+        case  ::dbaccess::DST_OUTLOOK:
+        case  ::dbaccess::DST_OUTLOOKEXP:
+        case  ::dbaccess::DST_EVOLUTION:
+        case  ::dbaccess::DST_KAB:
+        case  ::dbaccess::DST_MACAB:
             enableButtons(WZB_NEXT,sal_False);
             enableButtons(WZB_FINISH,sal_True);
             break;
@@ -194,12 +194,12 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur
         case START_PAGE:
             switch(m_eType)
             {
-                case DST_MOZILLA:
-                case DST_OUTLOOK:
-                case DST_OUTLOOKEXP:
-                case DST_EVOLUTION:
-                case DST_KAB:
-                case DST_MACAB:
+                case  ::dbaccess::DST_MOZILLA:
+                case  ::dbaccess::DST_OUTLOOK:
+                case  ::dbaccess::DST_OUTLOOKEXP:
+                case  ::dbaccess::DST_EVOLUTION:
+                case  ::dbaccess::DST_KAB:
+                case  ::dbaccess::DST_MACAB:
                     nNextState = WZS_INVALID_STATE;
                     break;
                 default:
@@ -210,47 +210,47 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur
         case CONNECTION_PAGE:
             switch(m_eType)
             {
-                case DST_MOZILLA:
-                case DST_THUNDERBIRD:
-                case DST_OUTLOOK:
-                case DST_OUTLOOKEXP:
-                case DST_EVOLUTION:
-                case DST_KAB:
-                case DST_MACAB:
-                case DST_MSACCESS:
-                case DST_MSACCESS_2007:
-                case DST_JDBC:
-                case DST_CALC:
+                case  ::dbaccess::DST_MOZILLA:
+                case  ::dbaccess::DST_THUNDERBIRD:
+                case  ::dbaccess::DST_OUTLOOK:
+                case  ::dbaccess::DST_OUTLOOKEXP:
+                case  ::dbaccess::DST_EVOLUTION:
+                case  ::dbaccess::DST_KAB:
+                case  ::dbaccess::DST_MACAB:
+                case  ::dbaccess::DST_MSACCESS:
+                case  ::dbaccess::DST_MSACCESS_2007:
+                case  ::dbaccess::DST_JDBC:
+                case  ::dbaccess::DST_CALC:
                     nNextState = WZS_INVALID_STATE;
                     break;
-                case DST_DBASE:
+                case  ::dbaccess::DST_DBASE:
                     nNextState = ADDITIONAL_PAGE_DBASE;
                     break;
-                case DST_FLAT:
+                case  ::dbaccess::DST_FLAT:
                     nNextState = ADDITIONAL_PAGE_FLAT;
                     break;
-                case DST_LDAP:
+                case  ::dbaccess::DST_LDAP:
                     nNextState = ADDITIONAL_PAGE_LDAP;
                     break;
-                case DST_ADABAS:
+                case  ::dbaccess::DST_ADABAS:
                     nNextState = ADDITIONAL_PAGE_ADABAS;
                     break;
-                case DST_MYSQL_NATIVE:
+                case  ::dbaccess::DST_MYSQL_NATIVE:
                     nNextState = ADDITIONAL_PAGE_MYSQL_NATIVE;
                     break;
-                case DST_MYSQL_JDBC:
+                case  ::dbaccess::DST_MYSQL_JDBC:
                     nNextState = ADDITIONAL_PAGE_MYSQL_JDBC;
                     break;
-                case DST_MYSQL_ODBC:
+                case  ::dbaccess::DST_MYSQL_ODBC:
                     nNextState = ADDITIONAL_PAGE_MYSQL_ODBC;
                     break;
-                case DST_ORACLE_JDBC:
+                case  ::dbaccess::DST_ORACLE_JDBC:
                     nNextState = ADDITIONAL_PAGE_ORACLE_JDBC;
                     break;
-                case DST_ADO:
+                case  ::dbaccess::DST_ADO:
                     nNextState = ADDITIONAL_PAGE_ADO;
                     break;
-                case DST_ODBC:
+                case  ::dbaccess::DST_ODBC:
                     nNextState = ADDITIONAL_PAGE_ODBC;
                     break;
                 default:
@@ -289,7 +289,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver()
     return m_pImpl->getDriver();
 }
 // -----------------------------------------------------------------------------
-DATASOURCE_TYPE ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const
+::dbaccess::DATASOURCE_TYPE ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const
 {
     return m_pImpl->getDatasourceType(_rSet);
 }
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index cc1d11b7daa1..e151f2214d4b 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dbwizsetup.cxx,v $
- * $Revision: 1.35 $
+ * $Revision: 1.35.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,6 +37,7 @@
 #include "dbadminsetup.hrc"
 #include "dbu_dlg.hrc"
 #include "dsitems.hxx"
+#include "dsnItem.hxx"
 
 #ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
 #include <svtools/pathoptions.hxx>
@@ -282,8 +283,8 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
                         WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP )
 
     , m_pOutSet(NULL)
-    , m_eType( DST_UNKNOWN )
-    , m_eOldType( DST_UNKNOWN )
+    , m_eType(  ::dbaccess::DST_UNKNOWN )
+    , m_eOldType(  ::dbaccess::DST_UNKNOWN )
     , m_bResetting(sal_False)
     , m_bApplied(sal_False)
     , m_bUIEnabled( sal_True )
@@ -333,31 +334,31 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     enableButtons(WZB_FINISH, sal_True);
     enableAutomaticNextButtonState();
 
-    declareAuthDepPath( DST_ADO,                ADO_PATH,               PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_DBASE,              DBASE_PATH,             PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_DBASE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_FLAT,               TEXT_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_TEXT, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_ADO,                ADO_PATH,               PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_DBASE,              DBASE_PATH,             PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_DBASE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_FLAT,               TEXT_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_TEXT, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
     declarePath       (                         SPREADSHEET_PATH,       PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_SPREADSHEET, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_ODBC,               ODBC_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ODBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_JDBC,               JDBC_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MYSQL_ODBC,         MYSQL_ODBC_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_ODBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MYSQL_JDBC,         MYSQL_JDBC_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MYSQL_NATIVE,       MYSQL_NATIVE_PATH,      PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_NATIVE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_ORACLE_JDBC,        ORACLE_PATH,            PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ORACLE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_ADABAS,             ADABAS_PATH,            PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADABAS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_LDAP,               LDAP_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_LDAP, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MSACCESS,           MSACCESS_PATH,          PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MSACCESS_2007,      MSACCESS2007_PATH,      PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_OUTLOOKEXP,         OUTLOOKEXP_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_OUTLOOK,            OUTLOOK_PATH,           PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MOZILLA,            MOZILLA_PATH,           PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_THUNDERBIRD,        THUNDERBIRD_PATH,       PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_EVOLUTION,          EVOLUTION_PATH,         PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_EVOLUTION_GROUPWISE,EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_EVOLUTION_LDAP,     EVOLUTION_PATH_LDAP,    PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_KAB,                KAB_PATH,               PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_MACAB,              MACAB_PATH,             PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1);
+    declareAuthDepPath(  ::dbaccess::DST_ODBC,               ODBC_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ODBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_JDBC,               JDBC_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MYSQL_ODBC,         MYSQL_ODBC_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_ODBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MYSQL_JDBC,         MYSQL_JDBC_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_JDBC, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MYSQL_NATIVE,       MYSQL_NATIVE_PATH,      PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MYSQL_INTRO, PAGE_DBSETUPWIZARD_MYSQL_NATIVE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_ORACLE_JDBC,        ORACLE_PATH,            PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ORACLE, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_ADABAS,             ADABAS_PATH,            PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_ADABAS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_LDAP,               LDAP_PATH,              PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_LDAP, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MSACCESS,           MSACCESS_PATH,          PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MSACCESS_2007,      MSACCESS2007_PATH,      PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_MSACCESS, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_OUTLOOKEXP,         OUTLOOKEXP_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_OUTLOOK,            OUTLOOK_PATH,           PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MOZILLA,            MOZILLA_PATH,           PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_THUNDERBIRD,        THUNDERBIRD_PATH,       PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_EVOLUTION,          EVOLUTION_PATH,         PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_EVOLUTION_GROUPWISE,EVOLUTION_PATH_GROUPWISE, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_EVOLUTION_LDAP,     EVOLUTION_PATH_LDAP,    PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_KAB,                KAB_PATH,               PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_MACAB,                 MACAB_PATH,             PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1);
     declareAuthDepPath( getDefaultDatabaseType(),CREATENEW_PATH,        PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
-    declareAuthDepPath( DST_USERDEFINE1,        USERDEFINED_PATH,       PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_USERDEFINED,PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
+    declareAuthDepPath(  ::dbaccess::DST_USERDEFINE1,        USERDEFINED_PATH,       PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_USERDEFINED,PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, -1 );
     declarePath       (                         OPEN_DOC_PATH,          PAGE_DBSETUPWIZARD_INTRO, -1 );
 
     m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS);
@@ -369,7 +370,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
     ActivatePage();
 }
 
-void ODbTypeWizDialogSetup::declareAuthDepPath( DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... )
+void ODbTypeWizDialogSetup::declareAuthDepPath( ::dbaccess::DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... )
 {
     bool bHasAuthentication = DataSourceMetaData::getAuthentication( _eType ) != AuthNone;
 
@@ -491,47 +492,47 @@ void ODbTypeWizDialogSetup::activateDatabasePath()
     case OGeneralPage::eConnectExternal:
     {
         m_eType = VerifyDataSourceType(m_pGeneralPage->GetSelectedType());
-        if (m_eType == DST_UNKNOWN)
+        if (m_eType ==  ::dbaccess::DST_UNKNOWN)
             m_eType = m_eOldType;
 
         struct _map_type_to_path
         {
-            DATASOURCE_TYPE             eType;
+            ::dbaccess::DATASOURCE_TYPE             eType;
             RoadmapWizardTypes::PathId  nPathId;
         } aKnownTypesAndPaths[] = {
-            { DST_DBASE,        DBASE_PATH          },
-            { DST_ADO,          ADO_PATH            },
-            { DST_FLAT,         TEXT_PATH           },
-            { DST_CALC,         SPREADSHEET_PATH    },
-            { DST_ODBC,         ODBC_PATH           },
-            { DST_JDBC,         JDBC_PATH           },
-            { DST_MYSQL_JDBC,   MYSQL_JDBC_PATH     },
-            { DST_MYSQL_NATIVE, MYSQL_NATIVE_PATH   },
-            { DST_MYSQL_ODBC,   MYSQL_ODBC_PATH     },
-            { DST_ORACLE_JDBC,  ORACLE_PATH         },
-            { DST_ADABAS,       ADABAS_PATH         },
-            { DST_LDAP,         LDAP_PATH           },
-            { DST_MSACCESS,     MSACCESS_PATH       },
-            { DST_MSACCESS_2007,MSACCESS2007_PATH   },
-            { DST_OUTLOOKEXP,   OUTLOOKEXP_PATH     },
-            { DST_OUTLOOK,      OUTLOOK_PATH        },
-            { DST_MOZILLA,      MOZILLA_PATH        },
-            { DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
-            { DST_EVOLUTION,    EVOLUTION_PATH      },
-            { DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE },
-            { DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP },
-            { DST_KAB,          KAB_PATH            },
-            { DST_MACAB,        MACAB_PATH          },
-            { DST_USERDEFINE1,  USERDEFINED_PATH    },
-            { DST_USERDEFINE2,  USERDEFINED_PATH    },
-            { DST_USERDEFINE3,  USERDEFINED_PATH    },
-            { DST_USERDEFINE4,  USERDEFINED_PATH    },
-            { DST_USERDEFINE5,  USERDEFINED_PATH    },
-            { DST_USERDEFINE6,  USERDEFINED_PATH    },
-            { DST_USERDEFINE7,  USERDEFINED_PATH    },
-            { DST_USERDEFINE8,  USERDEFINED_PATH    },
-            { DST_USERDEFINE9,  USERDEFINED_PATH    },
-            { DST_USERDEFINE10, USERDEFINED_PATH    }
+            {  ::dbaccess::DST_DBASE,        DBASE_PATH          },
+            {  ::dbaccess::DST_ADO,          ADO_PATH            },
+            {  ::dbaccess::DST_FLAT,         TEXT_PATH           },
+            {  ::dbaccess::DST_CALC,         SPREADSHEET_PATH    },
+            {  ::dbaccess::DST_ODBC,         ODBC_PATH           },
+            {  ::dbaccess::DST_JDBC,         JDBC_PATH           },
+            {  ::dbaccess::DST_MYSQL_JDBC,   MYSQL_JDBC_PATH     },
+            {  ::dbaccess::DST_MYSQL_NATIVE, MYSQL_NATIVE_PATH   },
+            {  ::dbaccess::DST_MYSQL_ODBC,   MYSQL_ODBC_PATH     },
+            {  ::dbaccess::DST_ORACLE_JDBC,  ORACLE_PATH         },
+            {  ::dbaccess::DST_ADABAS,       ADABAS_PATH         },
+            {  ::dbaccess::DST_LDAP,         LDAP_PATH           },
+            {  ::dbaccess::DST_MSACCESS,     MSACCESS_PATH       },
+            {  ::dbaccess::DST_MSACCESS_2007,MSACCESS2007_PATH   },
+            {  ::dbaccess::DST_OUTLOOKEXP,   OUTLOOKEXP_PATH     },
+            {  ::dbaccess::DST_OUTLOOK,      OUTLOOK_PATH        },
+            {  ::dbaccess::DST_MOZILLA,      MOZILLA_PATH        },
+            {  ::dbaccess::DST_THUNDERBIRD,  THUNDERBIRD_PATH    },
+            {  ::dbaccess::DST_EVOLUTION,    EVOLUTION_PATH      },
+            {  ::dbaccess::DST_EVOLUTION_GROUPWISE, EVOLUTION_PATH_GROUPWISE },
+            {  ::dbaccess::DST_EVOLUTION_LDAP, EVOLUTION_PATH_LDAP },
+            {  ::dbaccess::DST_KAB,          KAB_PATH            },
+            {  ::dbaccess::DST_MACAB,        MACAB_PATH          },
+            {  ::dbaccess::DST_USERDEFINE1,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE2,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE3,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE4,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE5,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE6,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE7,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE8,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE9,  USERDEFINED_PATH    },
+            {  ::dbaccess::DST_USERDEFINE10, USERDEFINED_PATH    }
         };
 
         size_t i = 0;
@@ -591,15 +592,15 @@ sal_Bool ODbTypeWizDialogSetup::IsConnectionUrlRequired()
 {
     switch ( m_eType )
     {
-        case DST_KAB:
-        case DST_MACAB:
-        case DST_EVOLUTION:
-        case DST_EVOLUTION_GROUPWISE:
-        case DST_EVOLUTION_LDAP:
-        case DST_OUTLOOK:
-        case DST_OUTLOOKEXP:
-        case DST_MOZILLA:
-        case DST_THUNDERBIRD:
+        case  ::dbaccess::DST_KAB:
+        case  ::dbaccess::DST_MACAB:
+        case  ::dbaccess::DST_EVOLUTION:
+        case  ::dbaccess::DST_EVOLUTION_GROUPWISE:
+        case  ::dbaccess::DST_EVOLUTION_LDAP:
+        case  ::dbaccess::DST_OUTLOOK:
+        case  ::dbaccess::DST_OUTLOOKEXP:
+        case  ::dbaccess::DST_MOZILLA:
+        case  ::dbaccess::DST_THUNDERBIRD:
             return sal_False;
         default:
             return sal_True;
@@ -650,21 +651,21 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver()
 }
 
 
-DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const
+::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const
 {
-    DATASOURCE_TYPE LocDatabaseType = _DatabaseType;
-    if ((LocDatabaseType == DST_MYSQL_JDBC) || (LocDatabaseType == DST_MYSQL_ODBC) || (LocDatabaseType == DST_MYSQL_NATIVE))
+    ::dbaccess::DATASOURCE_TYPE LocDatabaseType = _DatabaseType;
+    if ((LocDatabaseType ==  ::dbaccess::DST_MYSQL_JDBC) || (LocDatabaseType ==  ::dbaccess::DST_MYSQL_ODBC) || (LocDatabaseType ==  ::dbaccess::DST_MYSQL_NATIVE))
     {
         if (m_pMySQLIntroPage != NULL)
         {
             switch( m_pMySQLIntroPage->getMySQLMode() )
             {
                 case OMySQLIntroPageSetup::VIA_JDBC:
-                    return DST_MYSQL_JDBC;
+                    return  ::dbaccess::DST_MYSQL_JDBC;
                 case OMySQLIntroPageSetup::VIA_NATIVE:
-                    return DST_MYSQL_NATIVE;
+                    return  ::dbaccess::DST_MYSQL_NATIVE;
                 case OMySQLIntroPageSetup::VIA_ODBC:
-                    return DST_MYSQL_ODBC;
+                    return  ::dbaccess::DST_MYSQL_ODBC;
             }
         }
     }
@@ -674,9 +675,9 @@ DATASOURCE_TYPE ODbTypeWizDialogSetup::VerifyDataSourceType(const DATASOURCE_TYP
 
 
 // -----------------------------------------------------------------------------
-DATASOURCE_TYPE ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const
+::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const
 {
-    DATASOURCE_TYPE LocDatabaseType = m_pImpl->getDatasourceType(_rSet);
+    ::dbaccess::DATASOURCE_TYPE LocDatabaseType = m_pImpl->getDatasourceType(_rSet);
     return VerifyDataSourceType(LocDatabaseType);
 }
 
@@ -724,16 +725,16 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState)
             break;
 
         case PAGE_DBSETUPWIZARD_MYSQL_ODBC:
-            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_MYSQL_ODBC)));
+            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix( ::dbaccess::DST_MYSQL_ODBC)));
             pPage = OConnectionTabPageSetup::CreateODBCTabPage( this, *m_pOutSet);
             break;
 
         case PAGE_DBSETUPWIZARD_MYSQL_JDBC:
-            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_MYSQL_JDBC)));
+            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix( ::dbaccess::DST_MYSQL_JDBC)));
             pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( this, *m_pOutSet);
             break;
         case PAGE_DBSETUPWIZARD_MYSQL_NATIVE:
-            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_MYSQL_NATIVE)));
+            m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix( ::dbaccess::DST_MYSQL_NATIVE)));
             pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLNATIVETabPage( this, *m_pOutSet);
             break;
 
@@ -812,16 +813,16 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplModifiedHdl, OGenericAdministrationPage*, _
 // -----------------------------------------------------------------------------
 IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, /*_pMySQLIntroPageSetup*/)
 {
-    const DATASOURCE_TYPE eType = getDatasourceType(*m_pOutSet);
+    const ::dbaccess::DATASOURCE_TYPE eType = getDatasourceType(*m_pOutSet);
     switch( eType )
     {
-        case DST_MYSQL_ODBC:
+        case  ::dbaccess::DST_MYSQL_ODBC:
             activatePath( MYSQL_ODBC_PATH, sal_True);
             break;
-        case DST_MYSQL_JDBC:
+        case  ::dbaccess::DST_MYSQL_JDBC:
             activatePath( MYSQL_JDBC_PATH, sal_True);
             break;
-        case DST_MYSQL_NATIVE:
+        case  ::dbaccess::DST_MYSQL_NATIVE:
             activatePath( MYSQL_NATIVE_PATH, sal_True);
             break;
         default:
@@ -887,7 +888,7 @@ sal_Bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
         return sal_True;
     if ( _nState == PAGE_DBSETUPWIZARD_INTRO )
     {
-        OSL_ENSURE(m_eType != DST_UNKNOWN && m_eOldType != DST_UNKNOWN,"Type unknown");
+        OSL_ENSURE(m_eType !=  ::dbaccess::DST_UNKNOWN && m_eOldType !=  ::dbaccess::DST_UNKNOWN,"Type unknown");
         if ( m_eType != m_eOldType )
             resetPages(m_pImpl->getCurrentDataSource());
     }
@@ -1023,14 +1024,14 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     }
 
     //-------------------------------------------------------------------------
-    DATASOURCE_TYPE ODbTypeWizDialogSetup::getDefaultDatabaseType() const
+    ::dbaccess::DATASOURCE_TYPE ODbTypeWizDialogSetup::getDefaultDatabaseType() const
     {
-        DATASOURCE_TYPE eRet = DST_DBASE;
+        ::dbaccess::DATASOURCE_TYPE eRet =  ::dbaccess::DST_DBASE;
 
-        ::rtl::OUString sURL = m_pCollection->getDatasourcePrefix( DST_EMBEDDED_HSQLDB );
+        ::rtl::OUString sURL = m_pCollection->getDatasourcePrefix(  ::dbaccess::DST_EMBEDDED_HSQLDB );
         Reference< XDriverAccess > xDriverManager( getORB()->createInstance( SERVICE_SDBC_DRIVERMANAGER ), UNO_QUERY );
         if ( xDriverManager.is() && xDriverManager->getDriverByURL( sURL ).is() )
-            eRet = DST_EMBEDDED_HSQLDB;
+            eRet =  ::dbaccess::DST_EMBEDDED_HSQLDB;
 
         return eRet;
     }
@@ -1039,23 +1040,23 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
     void ODbTypeWizDialogSetup::CreateDatabase()
     {
         ::rtl::OUString sUrl;
-        DATASOURCE_TYPE eType = getDefaultDatabaseType();
-        if ( eType == DST_EMBEDDED_HSQLDB )
+        ::dbaccess::DATASOURCE_TYPE eType = getDefaultDatabaseType();
+        if ( eType ==  ::dbaccess::DST_EMBEDDED_HSQLDB )
         {
-            sUrl = m_pCollection->getDatasourcePrefix( DST_EMBEDDED_HSQLDB );
+            sUrl = m_pCollection->getDatasourcePrefix(  ::dbaccess::DST_EMBEDDED_HSQLDB );
             Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
             OSL_ENSURE(xDatasource.is(),"DataSource is null!");
             if ( xDatasource.is() )
-                xDatasource->setPropertyValue( PROPERTY_INFO, makeAny( m_pCollection->getDefaultDBSettings( DST_EMBEDDED_HSQLDB ) ) );
+                xDatasource->setPropertyValue( PROPERTY_INFO, makeAny( m_pCollection->getDefaultDBSettings(  ::dbaccess::DST_EMBEDDED_HSQLDB ) ) );
             m_pImpl->translateProperties(xDatasource,*m_pOutSet);
         }
-        if ( eType == DST_DBASE )
+        if ( eType ==  ::dbaccess::DST_DBASE )
         {
             Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY);
             INetURLObject aDBPathURL(m_sWorkPath);
             aDBPathURL.Append(m_aDocURL.getBase());
             createUniqueFolderName(&aDBPathURL);
-            ::rtl::OUString sPrefix = m_pCollection->getDatasourcePrefix(DST_DBASE);
+            ::rtl::OUString sPrefix = m_pCollection->getDatasourcePrefix( ::dbaccess::DST_DBASE);
             sUrl = aDBPathURL.GetMainURL( INetURLObject::NO_DECODE);
             xSimpleFileAccess->createFolder(sUrl);
             //OFileNotation aFileNotation(sUrl);
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index e461f478a4cc..1dc117fc474a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: detailpages.cxx,v $
- * $Revision: 1.53 $
+ * $Revision: 1.53.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -39,6 +39,7 @@
 #include "dsitems.hxx"
 #include "dbfindex.hxx"
 #include "localresaccess.hxx"
+#include "dsnItem.hxx"
 
 #include "dbaccess_helpid.hrc"
 #include "dbu_dlg.hrc"
@@ -311,7 +312,7 @@ namespace dbaui
         // get the DSN string (needed for the index dialog)
         SFX_ITEMSET_GET(_rSet, pUrlItem, SfxStringItem, DSID_CONNECTURL, sal_True);
         SFX_ITEMSET_GET(_rSet, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
-        ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL;
+        ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL;
         if (pTypeCollection && pUrlItem && pUrlItem->GetValue().Len())
             m_sDsn = pTypeCollection->cutPrefix(pUrlItem->GetValue());
 
@@ -1058,7 +1059,7 @@ namespace dbaui
     //------------------------------------------------------------------------
     SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet )
     {
-        DATASOURCE_TYPE eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet );
+        ::dbaccess::DATASOURCE_TYPE eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet );
         DataSourceMetaData aMetaData( eType );
         return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData );
     }
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 85c7adb2920e..7c67ebda24bf 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dsselect.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -107,7 +107,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::comphelper;
 //==================================================================
-ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet)
+ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, ::dbaccess::DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet)
      :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION))
      ,m_aDescription        (this, ModuleRes(FT_DESCRIPTION))
      ,m_aDatasource         (this, ModuleRes(LB_DATASOURCE))
@@ -120,7 +120,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB
      ,m_aCreateAdabasDB     (this, ModuleRes(PB_CREATE))
      ,m_pOutputSet(_pOutputSet)
 {
-    if (DST_ADABAS == _eType)
+    if ( ::dbaccess::DST_ADABAS == _eType)
     {   // set a new title (indicating that we're browsing local data sources only)
         SetText(ModuleRes(STR_LOCAL_DATASOURCES));
         m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2));
@@ -158,7 +158,7 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB
     fillListBox(_rDatasources);
 #ifdef HAVE_ODBC_ADMINISTRATION
     // allow ODBC datasource managenment
-    if ( DST_ODBC == _eType || DST_MYSQL_ODBC == _eType )
+    if (  ::dbaccess::DST_ODBC == _eType ||  ::dbaccess::DST_MYSQL_ODBC == _eType )
     {
         m_aManageDatasources.Show();
         m_aManageDatasources.Enable();
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index d5b0fe9e8b4e..0a2bb0e7fe0a 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dsselect.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -72,7 +72,7 @@ protected:
 #endif
 
 public:
-    ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet = NULL );
+    ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, ::dbaccess::DATASOURCE_TYPE _eType,SfxItemSet* _pOutputSet = NULL );
     ~ODatasourceSelectDialog();
 
     inline String   GetSelected() const { return m_aDatasource.GetSelectEntry();}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 79e1f50854e2..63a914b8b3c7 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: generalpage.cxx,v $
- * $Revision: 1.57 $
+ * $Revision: 1.56.68.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"
 
+#include "dsnItem.hxx"
 #ifndef _DBAUI_GENERALPAGE_HXX_
 #include "generalpage.hxx"
 #endif
@@ -119,8 +120,8 @@ namespace dbaui
         ,m_sMySQLEntry                  (ModuleRes(STR_MYSQLENTRY))
         ,m_eOriginalCreationMode        (eCreateNew)
         ,m_pCollection                  (NULL)
-        ,m_eCurrentSelection            (DST_UNKNOWN)
-        ,m_eNotSupportedKnownType       (DST_UNKNOWN)
+        ,m_eCurrentSelection            ( ::dbaccess::DST_UNKNOWN)
+        ,m_eNotSupportedKnownType       ( ::dbaccess::DST_UNKNOWN)
         ,m_eLastMessage                 (smNone)
         ,m_bDisplayingInvalid           (sal_False)
         ,m_bUserGrabFocus               (sal_True)
@@ -158,10 +159,10 @@ namespace dbaui
     {
         struct DisplayedType
         {
-            DATASOURCE_TYPE eType;
+            ::dbaccess::DATASOURCE_TYPE eType;
             String          sDisplayName;
 
-            DisplayedType( DATASOURCE_TYPE _eType, const String& _rDisplayName ) : eType( _eType ), sDisplayName( _rDisplayName ) { }
+            DisplayedType( ::dbaccess::DATASOURCE_TYPE _eType, const String& _rDisplayName ) : eType( _eType ), sDisplayName( _rDisplayName ) { }
         };
         typedef ::std::vector< DisplayedType > DisplayedTypes;
 
@@ -201,12 +202,12 @@ namespace dbaui
         {
             DisplayedTypes aDisplayedTypes;
 
-            for (   ODsnTypeCollection::TypeIterator aTypeLoop =  m_pCollection->begin();
+            for (   ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop =  m_pCollection->begin();
                     aTypeLoop != m_pCollection->end();
                     ++aTypeLoop
                 )
             {
-                DATASOURCE_TYPE eType = aTypeLoop.getType();
+                ::dbaccess::DATASOURCE_TYPE eType = aTypeLoop.getType();
 
                 if ( xDriverManager.is() )
                 {   // we have a driver manager to check
@@ -235,7 +236,7 @@ namespace dbaui
 
 
     //-------------------------------------------------------------------------
-    void OGeneralPage::setParentTitle(DATASOURCE_TYPE _eSelectedType)
+    void OGeneralPage::setParentTitle(::dbaccess::DATASOURCE_TYPE _eSelectedType)
     {
         if (!m_DBWizardMode)
         {
@@ -271,7 +272,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    void OGeneralPage::switchMessage(const DATASOURCE_TYPE _eType)
+    void OGeneralPage::switchMessage(const ::dbaccess::DATASOURCE_TYPE _eType)
     {
         SPECIAL_MESSAGE eMessage = smNone;
         if ( _eType == m_eNotSupportedKnownType )
@@ -298,7 +299,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    void OGeneralPage::onTypeSelected(const DATASOURCE_TYPE _eType)
+    void OGeneralPage::onTypeSelected(const ::dbaccess::DATASOURCE_TYPE _eType)
     {
         // the the new URL text as indicated by the selection history
         implSetCurrentType( _eType );
@@ -381,9 +382,9 @@ namespace dbaui
             sConnectURL = pUrlItem->GetValue();
         }
 
-        DATASOURCE_TYPE eOldSelection = m_eCurrentSelection;
-        m_eNotSupportedKnownType = DST_UNKNOWN;
-        implSetCurrentType( DST_UNKNOWN );
+        ::dbaccess::DATASOURCE_TYPE eOldSelection = m_eCurrentSelection;
+        m_eNotSupportedKnownType =  ::dbaccess::DST_UNKNOWN;
+        implSetCurrentType(  ::dbaccess::DST_UNKNOWN );
 
         // compare the DSN prefix with the registered ones
         String sDisplayName;
@@ -408,7 +409,7 @@ namespace dbaui
         }
 
         if (m_aRB_CreateDatabase.IsChecked() && m_DBWizardMode)
-            sDisplayName = m_pCollection->getTypeDisplayName(DST_JDBC);
+            sDisplayName = m_pCollection->getTypeDisplayName( ::dbaccess::DST_JDBC);
         m_pDatasourceType->SelectEntry(sDisplayName);
 
         // notify our listener that our type selection has changed (if so)
@@ -427,22 +428,22 @@ namespace dbaui
 
     // For the databaseWizard we only have one entry for the MySQL Database,
     // because we have a seperate tabpage to retrieve the respective datasource type
-    // (DST_MYSQL_ODBC || DST_MYSQL_JDBC). Therefore we use DST_MYSQL_JDBC as a temporary
+    // ( ::dbaccess::DST_MYSQL_ODBC ||  ::dbaccess::DST_MYSQL_JDBC). Therefore we use  ::dbaccess::DST_MYSQL_JDBC as a temporary
     // representative for all MySQl databases)
     // Also, embedded databases (embedded HSQL, at the moment), are not to appear in the list of
     // databases to connect to.
-    bool OGeneralPage::approveDataSourceType( DATASOURCE_TYPE eType, String& _inout_rDisplayName )
+    bool OGeneralPage::approveDataSourceType( ::dbaccess::DATASOURCE_TYPE eType, String& _inout_rDisplayName )
     {
-        if ( m_DBWizardMode && ( eType == DST_MYSQL_JDBC ) )
+        if ( m_DBWizardMode && ( eType ==  ::dbaccess::DST_MYSQL_JDBC ) )
             _inout_rDisplayName = m_sMySQLEntry;
 
-        else if ( m_DBWizardMode && ( eType == DST_MYSQL_ODBC ) )
+        else if ( m_DBWizardMode && ( eType ==  ::dbaccess::DST_MYSQL_ODBC ) )
             _inout_rDisplayName = String();
 
-        else if ( m_DBWizardMode && ( eType == DST_MYSQL_NATIVE ) )
+        else if ( m_DBWizardMode && ( eType ==  ::dbaccess::DST_MYSQL_NATIVE ) )
             _inout_rDisplayName = String();
 
-        else if ( eType == DST_EMBEDDED_HSQLDB )
+        else if ( eType ==  ::dbaccess::DST_EMBEDDED_HSQLDB )
             _inout_rDisplayName = String();
 
         return _inout_rDisplayName.Len() > 0;
@@ -450,7 +451,7 @@ namespace dbaui
 
 
     // -----------------------------------------------------------------------
-    void OGeneralPage::insertDatasourceTypeEntryData(DATASOURCE_TYPE _eType, String sDisplayName)
+    void OGeneralPage::insertDatasourceTypeEntryData(::dbaccess::DATASOURCE_TYPE _eType, String sDisplayName)
     {
         // insert a (temporary) entry
         sal_uInt16 nPos = m_pDatasourceType->InsertEntry(sDisplayName);
@@ -479,7 +480,7 @@ namespace dbaui
     }
 
     //-------------------------------------------------------------------------
-    void OGeneralPage::implSetCurrentType( const DATASOURCE_TYPE _eType )
+    void OGeneralPage::implSetCurrentType( const ::dbaccess::DATASOURCE_TYPE _eType )
     {
         if ( _eType == m_eCurrentSelection )
             return;
@@ -491,7 +492,7 @@ namespace dbaui
     void OGeneralPage::Reset(const SfxItemSet& _rCoreAttrs)
     {
         // reset all locale data
-        implSetCurrentType( DST_UNKNOWN );
+        implSetCurrentType(  ::dbaccess::DST_UNKNOWN );
             // this ensures that our type selection link will be called, even if the new is is the same as the
             // current one
         OGenericAdministrationPage::Reset(_rCoreAttrs);
@@ -507,7 +508,7 @@ namespace dbaui
         {
             if ( m_aRB_CreateDatabase.IsChecked() )
             {
-                _rCoreAttrs.Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix(DST_DBASE)));
+                _rCoreAttrs.Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getDatasourcePrefix( ::dbaccess::DST_DBASE)));
                 bChangedSomething = sal_True;
                 bCommitTypeSelection = false;
             }
@@ -524,7 +525,7 @@ namespace dbaui
         if ( bCommitTypeSelection )
         {
             USHORT nEntry = m_pDatasourceType->GetSelectEntryPos();
-            DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(m_pDatasourceType->GetEntryData(nEntry)));
+            ::dbaccess::DATASOURCE_TYPE eSelectedType = static_cast< ::dbaccess::DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(m_pDatasourceType->GetEntryData(nEntry)));
             if (m_DBWizardMode)
             {
                 if  (  ( m_pDatasourceType->GetSavedValue() != nEntry )
@@ -554,7 +555,7 @@ namespace dbaui
     {
         // get the type from the entry data
         sal_Int16 nSelected = _pBox->GetSelectEntryPos();
-        DATASOURCE_TYPE eSelectedType = static_cast<DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(_pBox->GetEntryData(nSelected)));
+        ::dbaccess::DATASOURCE_TYPE eSelectedType = static_cast< ::dbaccess::DATASOURCE_TYPE>(reinterpret_cast<sal_IntPtr>(_pBox->GetEntryData(nSelected)));
 
         setParentTitle(eSelectedType);
         // let the impl method do all the stuff
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index fe7c42a92d21..24f89ff3569f 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: generalpage.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.22.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -104,9 +104,10 @@ namespace dbaui
                             m_aControlDependencies;
 
 
-        ODsnTypeCollection* m_pCollection;  /// the DSN type collection instance
-        DATASOURCE_TYPE     m_eCurrentSelection;    /// currently selected type
-        DATASOURCE_TYPE     m_eNotSupportedKnownType;   /// if a data source of an unsupported, but known type is encountered ....
+        ::dbaccess::ODsnTypeCollection*
+                            m_pCollection;  /// the DSN type collection instance
+        ::dbaccess::DATASOURCE_TYPE     m_eCurrentSelection;    /// currently selected type
+        ::dbaccess::DATASOURCE_TYPE     m_eNotSupportedKnownType;   /// if a data source of an unsupported, but known type is encountered ....
 
         enum SPECIAL_MESSAGE
         {
@@ -121,8 +122,8 @@ namespace dbaui
         Link                m_aChooseDocumentHandler;       /// to be called when a recent document has been definately chosen
         sal_Bool            m_bDisplayingInvalid : 1;   // the currently displayed data source is deleted
         sal_Bool            m_bUserGrabFocus : 1;
-        bool                approveDataSourceType( DATASOURCE_TYPE eType, String& _inout_rDisplayName );
-        void                insertDatasourceTypeEntryData(DATASOURCE_TYPE eType, String sDisplayName);
+        bool                approveDataSourceType( ::dbaccess::DATASOURCE_TYPE eType, String& _inout_rDisplayName );
+        void                insertDatasourceTypeEntryData(::dbaccess::DATASOURCE_TYPE eType, String sDisplayName);
 
     public:
         static SfxTabPage*  Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False);
@@ -137,7 +138,7 @@ namespace dbaui
         DocumentDescriptor  GetSelectedDocument() const;
 
         /// get the currently selected datasource type
-        DATASOURCE_TYPE GetSelectedType() const { return m_eCurrentSelection; }
+        ::dbaccess::DATASOURCE_TYPE GetSelectedType() const { return m_eCurrentSelection; }
 
     protected:
         // SfxTabPage overridables
@@ -155,15 +156,15 @@ namespace dbaui
 
     protected:
 
-        void onTypeSelected(const DATASOURCE_TYPE _eType);
+        void onTypeSelected(const ::dbaccess::DATASOURCE_TYPE _eType);
         void initializeTypeList();
 
-        void implSetCurrentType( const DATASOURCE_TYPE _eType );
+        void implSetCurrentType( const ::dbaccess::DATASOURCE_TYPE _eType );
 
-        void switchMessage(const DATASOURCE_TYPE _eType);
+        void switchMessage(const ::dbaccess::DATASOURCE_TYPE _eType);
 
         /// sets the the title of the parent dialog
-        void setParentTitle(DATASOURCE_TYPE _eSelectedType);
+        void setParentTitle(::dbaccess::DATASOURCE_TYPE _eSelectedType);
 
         DECL_LINK(OnDatasourceTypeSelected, ListBox*);
         DECL_LINK(OnSetupModeSelected, RadioButton*);
author	Vladimir Glazounov <vg@openoffice.org>	2008-10-01 12:28:29 +0000
committer	Vladimir Glazounov <vg@openoffice.org>	2008-10-01 12:28:29 +0000
commit	d2b287cdd4f5bbe93b136d9f2bf2bf2cebfcbdb6 (patch)
tree	4f639206bc55b316e2be549cdb3d4db323fb3e0f /dbaccess/source/ui/dlg
parent	c8ebff286bc889d44236ab17de63fc3712c97acd (diff)