Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:52:23 Modified: dba/dbaccess/source/ui/dlg/dbwiz.cxx
Log: RESYNC: (1.9-1.11); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwiz.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwiz.cxx?r1=1.8.8.4&r2=1.8.8.5 Delta lines: +5 -6 ------------------- --- dbwiz.cxx 25 Apr 2006 13:02:55 -0000 1.8.8.4 +++ dbwiz.cxx 4 Jul 2006 07:52:20 -0000 1.8.8.5 @@ -98,7 +98,6 @@ namespace dbaui { //......................................................................... -using namespace dbtools; using namespace svt; using namespace com::sun::star::uno; using namespace com::sun::star::sdbc; @@ -132,10 +131,10 @@ ,const ::com::sun::star::uno::Any& _aDataSourceName ) :OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP, sal_True) + ,m_pOutSet(NULL) ,m_bResetting(sal_False) ,m_bApplied(sal_False) ,m_bUIEnabled( sal_True ) - ,m_pOutSet(NULL) { DBG_CTOR(ODbTypeWizDialog,NULL); m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); @@ -385,7 +384,7 @@ static_cast<OGenericAdministrationPage*>(pPage)->SetServiceFactory(m_pImpl->getORB()); static_cast<OGenericAdministrationPage*>(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); + LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); pPage->SetText(String(ResId(nStringId))); defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
