CWS-TOOLING: integrate CWS dbaperf2

2009-06-22 11:04:36 +0200 msc  r273202 : #100000# fix to run this test
2009-06-22 09:41:04 +0200 msc  r273200 : #100000# correct case
2009-06-22 09:02:42 +0200 msc  r273199 : new SRB
2009-06-22 08:53:26 +0200 msc  r273198 : #100000
2009-06-15 12:36:32 +0200 oj  r272976 : test
2009-06-12 14:23:23 +0200 msc  r272918 : #101587# unused feature was removed
2009-06-12 06:45:17 +0200 oj  r272903 : use GUI instead of OS
2009-06-11 09:12:30 +0200 oj  r272845 : remove unused dep
2009-06-11 09:11:09 +0200 oj  r272844 : ColumnAliasInOrderBy not supported
2009-06-11 08:27:00 +0200 oj  r272843 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@272827 (milestone: DEV300:m50)
2009-06-10 15:30:17 +0200 msc  r272822 : #100000
2009-06-10 15:27:40 +0200 msc  r272820 : #102515# new function for the database type list
2009-06-10 15:26:09 +0200 msc  r272818 : move file to dbaccess/tools/dbcreatetools.inc
2009-06-10 15:20:10 +0200 msc  r272816 : #102515# new function for the database type list
2009-06-10 12:34:46 +0200 oj  r272803 : #i101587# check extension
2009-06-10 11:53:45 +0200 oj  r272800 : remove unused code
2009-06-09 09:57:25 +0200 oj  r272752 : #i101587# EscapeDateTime moved into features section
2009-06-09 09:56:26 +0200 oj  r272751 : enable finish
2009-06-08 11:50:37 +0200 oj  r272726 : #i102588# move convert tzo saveDataSource
2009-06-05 11:54:20 +0200 jsk  r272676 : #i102515# - NEW: Functions to retrieve Database names from API
2009-06-05 10:52:22 +0200 jsk  r272671 : NEW: Functions to retrieve Database names from API
2009-06-05 09:36:54 +0200 oj  r272666 : handle win and unx differently
2009-06-05 09:36:28 +0200 oj  r272665 : handle win and unx differently
2009-06-04 13:41:56 +0200 oj  r272625 : #i101268# make use of stringbuffer instead of oustring
2009-06-04 10:18:14 +0200 oj  r272612 : add SAL_DLLPUBLIC_EXPORT
2009-05-28 10:56:33 +0200 oj  r272381 : #i101587# create langpacks
2009-05-28 10:41:59 +0200 oj  r272380 : #i101587# create langpacks
2009-05-28 10:29:30 +0200 oj  r272379 : #i101587# create langpacks
2009-05-07 10:11:46 +0200 oj  r271635 : fix compile warnings
2009-05-07 07:01:31 +0200 oj  r271619 : change type from int32 to PathID
2009-05-07 06:53:19 +0200 oj  r271618 : add all
2009-05-06 14:57:02 +0200 oj  r271595 : add missing lib
2009-05-06 14:56:54 +0200 oj  r271594 : no used anymore
2009-05-06 14:56:08 +0200 oj  r271593 : no used anymore
2009-05-06 14:54:25 +0200 oj  r271592 : no used anymore
2009-05-06 14:45:59 +0200 oj  r271591 : add missing lib
2009-05-06 14:41:54 +0200 oj  r271590 : change wnt
2009-05-06 14:22:21 +0200 oj  r271589 : #i101587# use config for the drivers
2009-05-06 14:21:39 +0200 oj  r271588 : #i101587# add new set for metadata and config data for driver
2009-05-06 14:19:36 +0200 oj  r271587 : #i101587# handle metadata and props of driver
2009-05-06 10:11:11 +0200 oj  r271570 : #i101587# correct wrong use of reference
2009-05-06 09:24:33 +0200 oj  r271567 : #i101587# add new set for metadata
2009-05-06 08:52:06 +0200 oj  r271563 : #i101587# add driver configuration
2009-05-06 08:51:04 +0200 oj  r271562 : #i101587# add driver configuration
2009-05-04 10:24:41 +0200 oj  r271442 : CWS-TOOLING: rebase CWS dbaperf2 to trunk@271427 (milestone: DEV300:m47)
2009-04-28 07:06:22 +0200 oj  r271303 : compile error
2009-04-27 14:12:48 +0200 oj  r271270 : #i101268# make use of stringbuffer instead of oustring
2009-04-27 14:12:27 +0200 oj  r271269 : #i101268# make use of stringbuffer instead of oustring
2009-04-27 09:30:10 +0200 oj  r271255 : use string buffer when possible
2009-04-24 11:56:01 +0200 oj  r271207 : #i101268# remove end() call from loop
2009-04-23 14:24:03 +0200 oj  r271171 : add dep
2009-04-23 13:25:25 +0200 oj  r271164 : #i101268# add config entries for database drivers
2009-04-23 13:07:13 +0200 oj  r271161 : #i101268# add config entries for database drivers
2009-04-23 13:06:33 +0200 oj  r271160 : #i101268# add parent url pattern entry for driver node
2009-04-23 13:05:39 +0200 oj  r271159 : #i101268# add config entry for driver node
2009-04-23 13:04:09 +0200 oj  r271157 : #i101268# add config entry for driver node
2009-04-23 06:41:32 +0200 oj  r271142 : #i101268# add new configuration file Drivers
2009-04-22 13:49:19 +0200 oj  r271103 : convert EOL
2009-04-22 13:29:17 +0200 oj  r271101 : #i101268# use of driver configuration entries for features and properties
2009-04-22 13:28:08 +0200 oj  r271100 : #i101268# use of driver configuration entries for features and properties
2009-04-22 13:15:26 +0200 oj  r271098 : #i101268# add new configuration file Drivers
2009-04-22 13:14:43 +0200 oj  r271097 : #i101268# use of driver configuration entries for features and properties

1 files changed, 28 insertions, 39 deletions

diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 16e4b51da212..ba0925d224ad 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -207,6 +207,7 @@ DBG_NAME(OConnectionHelper)
             m_pCollection = pCollectionItem->getCollection();
         m_aPB_Connection.SetClickHdl(LINK(this, OConnectionHelper, OnBrowseConnections));
         DBG_ASSERT(m_pCollection, "OConnectionHelper::OConnectionHelper : really need a DSN type collection !");
+        m_aConnectionURL.SetTypeCollection(m_pCollection);
     }
 
 
@@ -226,7 +227,7 @@ DBG_NAME(OConnectionHelper)
 
         m_aFT_Connection.Show();
         m_aConnectionURL.Show();
-        m_aConnectionURL.ShowPrefix( ::dbaccess::DST_JDBC == m_eType );
+        m_aConnectionURL.ShowPrefix( ::dbaccess::DST_JDBC == m_pCollection->determineType(m_eType) );
 
         BOOL bEnableBrowseButton = m_pCollection->supportsBrowsing( m_eType );
         m_aPB_Connection.Show( bEnableBrowseButton );
@@ -253,21 +254,16 @@ DBG_NAME(OConnectionHelper)
         if ( !m_pAdminDialog )
             return;
 
-        switch ( m_eType )
-        {
-        case  ::dbaccess::DST_CALC:
+        if ( m_pCollection->isFileSystemBased(m_eType) )
             m_pAdminDialog->enableConfirmSettings( getURLNoPrefix().Len() > 0 );
-            break;
-        default:
-            break;
-        }
     }
 
     // -----------------------------------------------------------------------
     IMPL_LINK(OConnectionHelper, OnBrowseConnections, PushButton*, /*_pButton*/)
     {
         OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
-        switch ( m_eType )
+        const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
+        switch ( eType )
         {
             case  ::dbaccess::DST_DBASE:
             case  ::dbaccess::DST_FLAT:
@@ -324,15 +320,16 @@ DBG_NAME(OConnectionHelper)
             break;
             case  ::dbaccess::DST_CALC:
             {
+                SvtModuleOptions aModule;
                 ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN
-                                                ,SvtModuleOptions().GetFactoryEmptyDocumentURL(SvtModuleOptions::E_CALC)
+                                                ,aModule.GetFactoryEmptyDocumentURL(SvtModuleOptions::E_CALC)
                                                 ,SFX_FILTER_IMPORT);
                 askForFileName(aFileDlg);
             }
             break;
             case  ::dbaccess::DST_MSACCESS:
             {
-                ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
+                const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
                 String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN);
                 aFileDlg.AddFilter(sFilterName,sExt);
@@ -342,7 +339,7 @@ DBG_NAME(OConnectionHelper)
             break;
             case  ::dbaccess::DST_MSACCESS_2007:
             {
-                ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
+                const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
                 String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
                 ::sfx2::FileDialogHelper aFileDlg(WB_3DLOOK | WB_STDMODAL | WB_OPEN);
                 aFileDlg.AddFilter(sFilterName2,sAccdb);
@@ -413,7 +410,7 @@ DBG_NAME(OConnectionHelper)
                         aInstalledDBs       = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir);
                     }
 
-                    ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, m_eType,m_pItemSetHelper->getWriteOutputSet());
+                    ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet());
                     if (RET_OK == aSelector.Execute())
                     {
                         setURLNoPrefix(aSelector.GetSelected());
@@ -435,9 +432,9 @@ DBG_NAME(OConnectionHelper)
             case  ::dbaccess::DST_ODBC:
             {
                 // collect all ODBC data source names
-                ::rtl::OUString sCurrDatasource=getURLNoPrefix();
+                ::rtl::OUString sCurrDatasource = getURLNoPrefix();
                 ::rtl::OUString sDataSource;
-                if ( getSelectedDataSource(m_eType,sDataSource,sCurrDatasource) && sDataSource.getLength() )
+                if ( getSelectedDataSource(sDataSource,sCurrDatasource) && sDataSource.getLength() )
                 {
                     setURLNoPrefix(sDataSource);
                     SetRoadmapStateValue(sal_True);
@@ -469,7 +466,7 @@ DBG_NAME(OConnectionHelper)
             case  ::dbaccess::DST_THUNDERBIRD:
             {
                 MozillaProductType profileType = MozillaProductType_Mozilla;
-                if (m_eType ==  ::dbaccess::DST_THUNDERBIRD)
+                if (eType ==  ::dbaccess::DST_THUNDERBIRD)
                     profileType = MozillaProductType_Thunderbird;
 
                 Reference<XMultiServiceFactory> xFactory = ::comphelper::getProcessServiceFactory();
@@ -496,7 +493,7 @@ DBG_NAME(OConnectionHelper)
 
 
                     // excute the select dialog
-                    ODatasourceSelectDialog aSelector(GetParent(), aProfiles, m_eType);
+                    ODatasourceSelectDialog aSelector(GetParent(), aProfiles, eType);
                     ::rtl::OUString sOldProfile=getURLNoPrefix();
 
                     if (sOldProfile.getLength())
@@ -539,7 +536,7 @@ DBG_NAME(OConnectionHelper)
                 String sTypePrefix, sFileURLEncoded;
                 if ( _bPrefix )
                 {
-                    sTypePrefix = m_pCollection->getDatasourcePrefix( m_eType );
+                    sTypePrefix = m_pCollection->getPrefix( m_eType );
                     sFileURLEncoded = m_pCollection->cutPrefix( sURL );
                 }
                 else
@@ -585,7 +582,7 @@ DBG_NAME(OConnectionHelper)
                 String sTypePrefix, sFileURLDecoded;
                 if ( _bPrefix )
                 {
-                    sTypePrefix = m_pCollection->getDatasourcePrefix( m_eType );
+                    sTypePrefix = m_pCollection->getPrefix( m_eType );
                     sFileURLDecoded = m_pCollection->cutPrefix( sURL );
                 }
                 else
@@ -770,10 +767,12 @@ DBG_NAME(OConnectionHelper)
         aConfigDBs  = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY);
         aWrkDBs     = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY);
         ConstStringBagIterator aOuter = aConfigDBs.begin();
-        for(;aOuter != aConfigDBs.end();++aOuter)
+        ConstStringBagIterator aOuterEnd = aConfigDBs.end();
+        for(;aOuter != aOuterEnd;++aOuter)
         {
             ConstStringBagIterator aInner = aWrkDBs.begin();
-            for (;aInner != aWrkDBs.end(); ++aInner)
+            ConstStringBagIterator aInnerEnd = aWrkDBs.end();
+            for (;aInner != aInnerEnd; ++aInner)
             {
                 if (aInner->equalsIgnoreAsciiCase(*aOuter))
                 {
@@ -811,11 +810,8 @@ DBG_NAME(OConnectionHelper)
     //-------------------------------------------------------------------------
     long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
     {
-        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 ( m_pCollection->isFileSystemBased(m_eType) )
+        {
             switch (_rNEvt.GetType())
             {
                 case EVENT_GETFOCUS:
@@ -832,7 +828,8 @@ DBG_NAME(OConnectionHelper)
                             return 1L;  // handled
                     }
                     break;
-            }
+            } // switch (_rNEvt.GetType())
+        }
 
         return OGenericAdministrationPage::PreNotify( _rNEvt );
     }
@@ -933,13 +930,7 @@ DBG_NAME(OConnectionHelper)
         sOldPath = m_aConnectionURL.GetSavedValueNoPrefix();
         sURL = m_aConnectionURL.GetTextNoPrefix();
 
-        switch ( m_eType )
-        {
-        case ::dbaccess::DST_DBASE:
-        case ::dbaccess::DST_FLAT:
-        case ::dbaccess::DST_MSACCESS:
-        case ::dbaccess::DST_MSACCESS_2007:
-        case ::dbaccess::DST_CALC:
+        if ( m_pCollection->isFileSystemBased(m_eType) )
         {
             if ( ( sURL != sOldPath ) && ( 0 != sURL.Len() ) )
             {   // the text changed since entering the control
@@ -948,7 +939,9 @@ DBG_NAME(OConnectionHelper)
                 OFileNotation aTransformer(sURL);
                 sURL = aTransformer.get(OFileNotation::N_URL);
 
-                if ( ( ::dbaccess::DST_CALC == m_eType) || ( ::dbaccess::DST_MSACCESS == m_eType) || ( ::dbaccess::DST_MSACCESS_2007 == m_eType) )
+                const ::dbaccess::DATASOURCE_TYPE eType = m_pCollection->determineType(m_eType);
+
+                if ( ( ::dbaccess::DST_CALC == eType) || ( ::dbaccess::DST_MSACCESS == eType) || ( ::dbaccess::DST_MSACCESS_2007 == eType) )
                 { // #106016# --------------------------
                     if( pathExists(sURL, sal_True) == PATH_NOT_EXIST )
                     {
@@ -978,10 +971,6 @@ DBG_NAME(OConnectionHelper)
                 }
             }
         }
-        break;
-        default:
-            break;
-        }
 
         setURLNoPrefix(sURL);
         m_aConnectionURL.SaveValueNoPrefix();