Tag: cws_src680_os63 User: os Date: 06/02/08 09:37:42 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: RESYNC: (1.13-1.15); FILE MERGED 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.11.54.3&r2=1.11.54.4 Delta lines: +36 -24 --------------------- --- dbwizsetup.cxx 15 Sep 2005 22:53:12 -0000 1.11.54.3 +++ dbwizsetup.cxx 8 Feb 2006 17:37:39 -0000 1.11.54.4 @@ -242,10 +242,11 @@ #define OUTLOOK_PATH 14 #define MOZILLA_PATH 15 #define EVOLUTION_PATH 16 -#define THUNDERBIRD_PATH 17 -#define CREATENEW_PATH 18 -#define USERDEFINED_PATH 19 -#define OPEN_DOC_PATH 20 +#define KAB_PATH 17 +#define THUNDERBIRD_PATH 18 +#define CREATENEW_PATH 19 +#define USERDEFINED_PATH 20 +#define OPEN_DOC_PATH 21 OFinalDBPageSetup* pFinalPage; @@ -393,6 +394,11 @@ else declarePath( EVOLUTION_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(DST_KAB)) + declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + else + declarePath( KAB_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); + if ( m_pCollection->hasAuthentication(m_pCollection->getEmbeddedDatabaseType(getORB()))) declarePath( CREATENEW_PATH, PAGE_DBSETUPWIZARD_INTRO, PAGE_DBSETUPWIZARD_AUTHENTIFICATION, PAGE_DBSETUPWIZARD_FINAL, WZS_INVALID_STATE); else @@ -534,6 +540,7 @@ { DST_MOZILLA, MOZILLA_PATH }, { DST_THUNDERBIRD, THUNDERBIRD_PATH }, { DST_EVOLUTION, EVOLUTION_PATH }, + { DST_KAB, KAB_PATH }, { DST_USERDEFINE1, USERDEFINED_PATH }, { DST_USERDEFINE2, USERDEFINED_PATH }, { DST_USERDEFINE3, USERDEFINED_PATH }, @@ -604,6 +611,7 @@ DATASOURCE_TYPE eType = getDatasourceType(*m_pOutSet); switch ( m_eType ) { + case DST_KAB: case DST_EVOLUTION: case DST_OUTLOOK: case DST_OUTLOOKEXP: @@ -1074,15 +1082,16 @@ const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) { - INetURLObject aWorkURL(m_sWorkPath); - String sBase = String(ModuleRes(STR_DATABASEDEFAULTNAME)); - aWorkURL.Append(sBase); -// aWorkURL.setBase(sBase); + INetURLObject aWorkURL( m_sWorkPath ); + aFileDlg.SetDisplayFolder( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); + + ::rtl::OUString sDefaultName = String( ModuleRes( STR_DATABASEDEFAULTNAME ) ); ::rtl::OUString sExtension = pFilter->GetDefaultExtension(); - sExtension = sExtension.replaceAt( 0, 2, ::rtl::OUString()); - aWorkURL.setExtension(sExtension); - createUniqueFileName(&aWorkURL); - aFileDlg.SetDisplayDirectory( aWorkURL.GetMainURL( INetURLObject::NO_DECODE )); + sDefaultName += sExtension.replaceAt( 0, 1, ::rtl::OUString() ); + aWorkURL.Append( sDefaultName ); + sDefaultName = createUniqueFileName( aWorkURL ); + aFileDlg.SetFileName( sDefaultName ); + aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension()); aFileDlg.SetCurrentFilter(pFilter->GetUIName()); } @@ -1121,23 +1130,26 @@ } //------------------------------------------------------------------------- - void ODbTypeWizDialogSetup::createUniqueFileName(INetURLObject* pURL) + String ODbTypeWizDialogSetup::createUniqueFileName(const INetURLObject& _rURL) { Reference< XSimpleFileAccess > xSimpleFileAccess(getORB()->createInstance(::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" )), UNO_QUERY); - :: rtl::OUString sFilename = pURL->getName(); - ::rtl::OUString BaseName = pURL->getBase(); - ::rtl::OUString sExtension = pURL->getExtension(); + :: rtl::OUString sFilename = _rURL.getName(); + ::rtl::OUString BaseName = _rURL.getBase(); + ::rtl::OUString sExtension = _rURL.getExtension(); + sal_Bool bElementExists = sal_True; - sal_Int32 i = 1; - while (bElementExists == sal_True) + + INetURLObject aExistenceCheck( _rURL ); + for ( sal_Int32 i = 1; bElementExists; ++i ) { - bElementExists = xSimpleFileAccess->exists(pURL->GetMainURL( INetURLObject::NO_DECODE )); - if (bElementExists == sal_True) + bElementExists = xSimpleFileAccess->exists( aExistenceCheck.GetMainURL( INetURLObject::NO_DECODE ) ); + if ( bElementExists ) { - i++; - pURL->setBase(BaseName.concat(::rtl::OUString::valueOf(i))); + ++i; + aExistenceCheck.setBase( BaseName.concat( ::rtl::OUString::valueOf( i ) ) ); } } + return aExistenceCheck.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); } // ----------------------------------------------------------------------------- IWizardPage* ODbTypeWizDialogSetup::getWizardPage(TabPage* _pCurrentPage) const --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
