User: rt Date: 06/05/04 01:41:49 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: INTEGRATION: CWS dba203c (1.16.20); FILE MERGED 2006/03/29 11:21:52 fs 1.16.20.1: #133638# removed unused OLocalResourceAccess instance / renamed ambiguous ::dbui::OLocalResourceAccess to LocalresourceAccess 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.16&r2=1.17 Delta lines: +3 -6 ------------------- --- dbwizsetup.cxx 28 Feb 2006 10:36:25 -0000 1.16 +++ dbwizsetup.cxx 4 May 2006 08:41:46 -0000 1.17 @@ -485,7 +485,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; @@ -816,14 +816,11 @@ { 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
