Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:57:27 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: RESYNC: (1.16-1.18); 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.13.6.5&r2=1.13.6.6 Delta lines: +33 -29 --------------------- --- dbwizsetup.cxx 25 Apr 2006 13:02:55 -0000 1.13.6.5 +++ dbwizsetup.cxx 4 Jul 2006 07:57:24 -0000 1.13.6.6 @@ -261,15 +261,17 @@ ,const Reference< XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName ) - :svt::RoadmapWizard(_pParent, ModuleRes(DLG_DATABASE_WIZARD), - WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP - , ResId( STR_ROADMAPHEADER), sal_True) + :svt::RoadmapWizard( _pParent, ModuleRes(DLG_DATABASE_WIZARD), + WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP, + ResId( STR_ROADMAPHEADER ), sal_True) + + , m_pOutSet(NULL) + , m_eType( DST_UNKNOWN ) + , m_eOldType( DST_UNKNOWN ) , m_bResetting(sal_False) , m_bApplied(sal_False) , m_bUIEnabled( sal_True ) , m_bIsConnectable( sal_False) - , m_pOutSet(NULL) - , m_pMySQLIntroPage(NULL) , m_sRM_IntroText(ResId(STR_PAGETITLE_INTROPAGE)) , m_sRM_dBaseText(ResId(STR_PAGETITLE_DBASE)) , m_sRM_TextText(ResId(STR_PAGETITLE_TEXT)) @@ -278,6 +280,9 @@ , m_sRM_ADABASText(ResId(STR_PAGETITLE_ADABAS)) , m_sRM_ADOText(ResId(STR_PAGETITLE_ADO)) , m_sRM_JDBCText(ResId(STR_PAGETITLE_JDBC)) + , m_pGeneralPage( NULL ) + , m_pMySQLIntroPage(NULL) + , m_pCollection( NULL ) { DBG_CTOR(ODbTypeWizDialogSetup,NULL); // no local resources needed anymore @@ -482,7 +487,7 @@ break; case PAGE_DBSETUPWIZARD_USERDEFINED: { - OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); + LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); sRoadmapItem = String(ResId(STR_PAGETITLE_CONNECTION)); } break; @@ -503,7 +508,7 @@ } //------------------------------------------------------------------------- -IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, _pTabPage) +IMPL_LINK(ODbTypeWizDialogSetup, OnTypeSelected, OGeneralPage*, /*_pTabPage*/) { activateDatabasePath(); return 1L; @@ -564,7 +569,7 @@ { DST_USERDEFINE10, USERDEFINED_PATH } }; - sal_Int32 i = 0; + size_t i = 0; for ( ; i < sizeof( aKnownTypesAndPaths ) / sizeof( aKnownTypesAndPaths[0] ); ++i ) { if ( aKnownTypesAndPaths[i].eType == m_eType ) @@ -619,7 +624,6 @@ //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::IsConnectionUrlRequired() { - DATASOURCE_TYPE eType = getDatasourceType(*m_pOutSet); switch ( m_eType ) { case DST_KAB: @@ -631,7 +635,6 @@ case DST_MOZILLA: case DST_THUNDERBIRD: return sal_False; - break; default: return sal_True; } @@ -726,7 +729,6 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) { SfxTabPage* pFirstPage; - sal_Bool bResetPasswordRequired = sal_False; OGenericAdministrationPage* pPage = NULL; switch(_nState) { @@ -813,15 +815,12 @@ { pPage->SetModifiedHandler(LINK( this, ODbTypeWizDialogSetup, ImplModifiedHdl ) ); } - // register ourself as modified listener + if ( pPage ) { pPage->SetServiceFactory(m_pImpl->getORB()); pPage->SetAdminDialog(this, this); - // open our own resource block, as the page titles are strings local to this block - OLocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); - defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? WZB_FINISH : WZB_NEXT ); enableButtons( WZB_FINISH, _nState == START_PAGE ? sal_False : sal_True); enableButtons( WZB_NEXT, _nState == PAGE_DBSETUPWIZARD_FINAL ? sal_False : sal_True); @@ -846,7 +845,7 @@ // ----------------------------------------------------------------------------- -IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLIntroPageSetup) +IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, /*_pMySQLIntroPageSetup*/) { if (getDatasourceType(*m_pOutSet) == DST_MYSQL_ODBC) activatePath( MYSQL_ODBC_PATH, sal_True); @@ -856,21 +855,21 @@ } // ----------------------------------------------------------------------------- -IMPL_LINK(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPage*, _pGeneralPage) +IMPL_LINK(ODbTypeWizDialogSetup, OnChangeCreationMode, OGeneralPage*, /*_pGeneralPage*/) { activateDatabasePath(); return sal_True; } // ----------------------------------------------------------------------------- -IMPL_LINK(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPage*, _pGeneralPage) +IMPL_LINK(ODbTypeWizDialogSetup, OnRecentDocumentSelected, OGeneralPage*, /*_pGeneralPage*/) { enableButtons( WZB_FINISH, m_pGeneralPage->GetSelectedDocument().sURL.Len() != 0 ); return 0L; } // ----------------------------------------------------------------------------- -IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPage*, _pGeneralPage) +IMPL_LINK(ODbTypeWizDialogSetup, OnSingleDocumentChosen, OGeneralPage*, /*_pGeneralPage*/) { if ( prepareLeaveCurrentState( eFinish ) ) onFinish( RET_OK ); @@ -909,22 +908,24 @@ { if (_nState == PAGE_DBSETUPWIZARD_MYSQL_INTRO) return sal_True; - if ( _nState == PAGE_DBSETUPWIZARD_INTRO ){ - OGeneralPage* pPage = static_cast<OGeneralPage*>(WizardDialog::GetPage(getCurrentState())); + if ( _nState == PAGE_DBSETUPWIZARD_INTRO ) + { OSL_ENSURE(m_eType != DST_UNKNOWN && m_eOldType != DST_UNKNOWN,"Type unknown"); if ( m_eType != m_eOldType ) resetPages(m_pImpl->getCurrentDataSource()); } SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(_nState)); if ( pPage ) - return pPage->DeactivatePage(m_pOutSet); + return pPage->DeactivatePage(m_pOutSet) != 0; else return sal_False; } // ----------------------------------------------------------------------------- -void ODbTypeWizDialogSetup::setTitle(const ::rtl::OUString& _sTitle) +void ODbTypeWizDialogSetup::setTitle(const ::rtl::OUString& /*_sTitle*/) { + DBG_ERROR( "ODbTypeWizDialogSetup::setTitle: not implemented!" ); + // why? } //------------------------------------------------------------------------- @@ -937,7 +938,10 @@ { m_pImpl->saveChanges(*m_pOutSet); Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource(); +#if OSL_DEBUG_LEVEL > 0 SFX_ITEMSET_GET(*m_pOutSet, pDocUrl, SfxStringItem, DSID_DOCUMENT_URL, sal_True); + (void)pDocUrl; +#endif Reference<XStorable> xStore(getDataSourceOrModel(xDatasource),UNO_QUERY); Reference<XComponent> xComponent(xStore,UNO_QUERY); ::rtl::OUString sPath = m_pImpl->getDocumentUrl(*m_pOutSet); @@ -1007,7 +1011,7 @@ pRequest ->addContinuation (pAbort ); if ( xHandler.is() ) xHandler->handle( xRequest ); - e; // make compiler happy + (void)e; // make compiler happy } return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
