Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:20:23+0000 Log: RESYNC: (1.100-1.102); FILE MERGED
File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbadmin.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbadmin.cxx?r1=1.95.4.6&r2=1.95.4.7 Delta lines: +8 -3 ------------------- --- dbadmin.cxx 2006-12-18 16:19:36+0000 1.95.4.6 +++ dbadmin.cxx 2007-06-04 18:20:20+0000 1.95.4.7 @@ -120,7 +120,7 @@ m_pImpl = ::std::auto_ptr<ODbDataSourceAdministrationHelper>(new ODbDataSourceAdministrationHelper(_rxORB,this,this)); // add the initial tab page - AddTabPage(PAGE_CONNECTION, String(ResId(STR_PAGETITLE_GENERAL)), OConnectionTabPage::Create, NULL); + AddTabPage(PAGE_CONNECTION, String(ModuleRes(STR_PAGETITLE_GENERAL)), OConnectionTabPage::Create, NULL); // remove the reset button - it's meaning is much too ambiguous in this dialog RemoveResetButton(); @@ -176,7 +176,7 @@ // open our own resource block, as the page titles are strings local to this block LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); - AddTabPage(_nPageId, String(ResId(_nTextId)), _pCreateFunc, NULL); + AddTabPage(_nPageId, String(ModuleRes(_nTextId)), _pCreateFunc, NULL); m_aCurrentDetailPages.push(_nPageId); } @@ -245,7 +245,7 @@ case DST_USERDEFINE10: { LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); - String aTitle(ResId(STR_PAGETITLE_ADVANCED)); + String aTitle(ModuleRes(STR_PAGETITLE_ADVANCED)); AddTabPage(PAGE_USERDRIVER, aTitle, ODriversSettings::CreateUser, 0, sal_False, 1); m_aCurrentDetailPages.push(PAGE_USERDRIVER); } @@ -328,6 +328,11 @@ SetText(_sTitle); } //------------------------------------------------------------------------- +void ODbAdminDialog::enableConfirmSettings( bool _bEnable ) +{ + (void)_bEnable; +} +//------------------------------------------------------------------------- sal_Bool ODbAdminDialog::saveDatasource() { return PrepareLeaveCurrentPage(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
