User: kz Date: 05/01/21 09:15:03 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: INTEGRATION: CWS dba22 (1.3.2); FILE MERGED 2005/01/10 08:51:33 oj 1.3.2.7: compile error 2005/01/07 07:55:40 oj 1.3.2.6: RESYNC: (1.3-1.7); FILE MERGED 2005/01/06 12:42:52 oj 1.3.2.5: #i39321# extend createConnection to return a pair now 2005/01/04 11:48:42 oj 1.3.2.4: #i39671# remove some unused code for dbwiz 2004/12/08 09:37:31 oj 1.3.2.3: #i33656# fix for userdefined drivers 2004/12/07 13:46:22 oj 1.3.2.2: #i37012# remove unused code 2004/12/07 13:31:23 oj 1.3.2.1: #i37012# do not start with a number when creating a unque name File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.7&r2=1.8 Delta lines: +52 -72 --------------------- --- dbwizsetup.cxx 5 Jan 2005 12:35:03 -0000 1.7 +++ dbwizsetup.cxx 21 Jan 2005 17:15:01 -0000 1.8 @@ -128,7 +128,12 @@ #ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" #endif +#ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" +#endif +#ifndef _DBAUI_DBADMIN_HRC_ +#include "dbadmin.hrc" +#endif #ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_ #include <com/sun/star/frame/XStorable.hpp> #endif @@ -193,7 +198,7 @@ - +#include <memory> //......................................................................... @@ -236,6 +241,7 @@ #define PAGE_DBSETUPWIZARD_SPREADSHEET 13 #define PAGE_DBSETUPWIZARD_AUTHENTIFICATION 14 #define PAGE_DBSETUPWIZARD_FINAL 15 +#define PAGE_DBSETUPWIZARD_USERDEFINED 16 #define DBASE_PATH 1 @@ -255,6 +261,7 @@ #define MOZILLA_PATH 15 #define EVOLUTION_PATH 16 #define CREATENEW_PATH 17 +#define USERDEFINED_PATH 18 OFinalDBPageSetup* pFinalPage; @@ -406,6 +413,11 @@ else declarePath( CREATENEW_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_USERDEFINE1)) + declarePath( USERDEFINED_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_USERDEFINED,PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( USERDEFINED_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_USERDEFINED,PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); m_pCancel->SetHelpId(HID_DBWIZ_CANCEL); @@ -418,7 +430,7 @@ String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ){ - String sRoadmapItem = String::CreateFromAscii(""); + String sRoadmapItem; switch( _nState ) { case PAGE_DBSETUPWIZARD_INTRO: @@ -467,6 +479,12 @@ case PAGE_DBSETUPWIZARD_AUTHENTIFICATION: sRoadmapItem = m_sRM_AuthentificationText; break; + case PAGE_DBSETUPWIZARD_USERDEFINED: + { + OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); + sRoadmapItem = String(ResId(STR_PAGETITLE_CONNECTION)); + } + break; case PAGE_DBSETUPWIZARD_FINAL: sRoadmapItem = m_sRM_FinalText; break; @@ -569,7 +587,8 @@ activatePath( EVOLUTION_PATH, sal_True); break; - case DST_USERDEFINE2: /// first user defined driver + case DST_USERDEFINE1:/// first user defined driver + case DST_USERDEFINE2: case DST_USERDEFINE3: case DST_USERDEFINE4: case DST_USERDEFINE5: @@ -578,7 +597,10 @@ case DST_USERDEFINE8: case DST_USERDEFINE9: case DST_USERDEFINE10: + activatePath( USERDEFINED_PATH, sal_True); break; + default: + OSL_ENSURE(0,"Unknown database type!"); } ToggleFollowingRoadmapSteps(); } @@ -659,7 +681,7 @@ return m_pOutSet; } // ----------------------------------------------------------------------------- -Reference< XConnection > ODbTypeWizDialogSetup::createConnection() +::std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialogSetup::createConnection() { return m_pImpl->createConnection(); } @@ -781,6 +803,10 @@ pPage = OAuthentificationPageSetup::CreateAuthentificationTabPage(this,*m_pOutSet); break; + case PAGE_DBSETUPWIZARD_USERDEFINED: + pPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(this,*m_pOutSet); + break; + case PAGE_DBSETUPWIZARD_FINAL: pPage = OFinalDBPageSetup::CreateFinalDBTabPageSetup(this,*m_pOutSet); pFinalPage = static_cast<OFinalDBPageSetup*> (pPage); @@ -1020,29 +1046,28 @@ } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(::rtl::OUString sPath) + void ODbTypeWizDialogSetup::RegisterDataSourceByLocation(const ::rtl::OUString& _sPath) { Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); Reference< XNamingService > xDatabaseContext(getORB()->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); Reference< XNameAccess > xNameAccessDatabaseContext(xDatabaseContext, UNO_QUERY); - INetURLObject aURL( sPath ); + INetURLObject aURL( _sPath ); ::rtl::OUString sFilename = aURL.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename); + ::rtl::OUString sDatabaseName = ::dbtools::createUniqueName(xNameAccessDatabaseContext, sFilename,sal_False); xDatabaseContext->registerObject(sDatabaseName, xDatasource); } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::OpenDatabaseDocument(::rtl::OUString sPath) + void ODbTypeWizDialogSetup::OpenDatabaseDocument(const ::rtl::OUString& _sPath) { // get the desktop object sal_Int32 nFrameSearchFlag = FrameSearchFlag::ALL | FrameSearchFlag::GLOBAL ; Reference< XComponentLoader > xFrameLoader(getORB()->createInstance(SERVICE_FRAME_DESKTOP),UNO_QUERY); - ::rtl::OUString sTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")); if ( xFrameLoader.is() ) { xFrameLoader->loadComponentFromURL( - sPath, + _sPath, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), nFrameSearchFlag, Sequence<PropertyValue >() ); @@ -1054,14 +1079,8 @@ { short nResult = ModalDialog::Execute(); - if ( RET_OK == nResult ) - if (pFinalPage != NULL) - { - if (pFinalPage->IsTableWizardToBeStarted()) - { + if ( RET_OK == nResult && pFinalPage != NULL && pFinalPage->IsTableWizardToBeStarted() ) StartTableWizard(); - } - } return nResult; } @@ -1082,16 +1101,13 @@ aWorkURL.Append(sBase); // aWorkURL.setBase(sBase); ::rtl::OUString sExtension = pFilter->GetDefaultExtension(); - sExtension = sExtension.replaceAt( 0, 2, ::rtl::OUString::createFromAscii("")); + sExtension = sExtension.replaceAt( 0, 2, ::rtl::OUString()); aWorkURL.setExtension(sExtension); createUniqueFileName(&aWorkURL); aFileDlg.SetDisplayDirectory( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); aFileDlg.SetCurrentFilter(pFilter->GetUIName()); } - Reference< XNameAccess > xDatabaseContext(getORB()->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); - if ( xDatabaseContext.is() ) - { if ( aFileDlg.Execute() == ERRCODE_NONE ) { m_aDocURL = INetURLObject(aFileDlg.GetPath()); @@ -1105,7 +1121,6 @@ bRet = sal_True; } } - } return bRet; } @@ -1149,39 +1164,6 @@ } } } - - -//------------------------------------------------------------------------- - ::rtl::OUString ODbTypeWizDialogSetup::createUniqueName(com::sun::star::uno::Sequence< ::rtl::OUString > sContent, ::rtl::OUString _ElementName) - { - sal_Bool bElementexists = sal_True; - sal_Int32 i = 1; - ::rtl::OUString sIncSuffix; - ::rtl::OUString BaseName = _ElementName; - sal_Int32 nCnt = sContent.getLength(); - if (nCnt > 0) - { - while (bElementexists == sal_True) - { - bElementexists = sal_False; - for (sal_Int32 n = 0; i < nCnt; i++) - { - bElementexists = (sContent[n].compareTo( _ElementName ) == 0); - if (bElementexists == sal_True) - { - i++; - _ElementName = BaseName.concat(::rtl::OUString::valueOf(i)); - bElementexists = sal_True; - break; - } - } - } - } - return _ElementName; - } - - - // ----------------------------------------------------------------------------- IWizardPage* ODbTypeWizDialogSetup::getWizardPage(TabPage* _pCurrentPage) const { @@ -1212,10 +1194,8 @@ try { ::rtl::OUString sPath = m_pImpl->getDocumentUrl(*m_pOutSet); - OLinkedDocumentsAccess* oLinkedDocument = new OLinkedDocumentsAccess(this, getORB(), NULL, NULL); - sal_Int32 nCommandType(::com::sun::star::sdb::CommandType::TABLE); - String sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); - oLinkedDocument->newTableWithPilot(sPath, nCommandType, sName, NULL); + ::std::auto_ptr<OLinkedDocumentsAccess> oLinkedDocument(new OLinkedDocumentsAccess(this, getORB(), NULL, NULL)); + oLinkedDocument->newTableWithPilot(sPath, NULL); } catch(const Exception&) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
