Tag: cws_src680_oj14 User: oj Date: 2007-06-04 18:09:51+0000 Log: RESYNC: (1.12-1.14); 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.6&r2=1.8.8.7 Delta lines: +12 -28 --------------------- --- dbwiz.cxx 2006-11-07 09:18:13+0000 1.8.8.6 +++ dbwiz.cxx 2007-06-04 18:09:48+0000 1.8.8.7 @@ -262,33 +262,6 @@ return nNextState; } -//------------------------------------------------------------------------- -void ODbTypeWizDialog::resetPages(const Reference< XPropertySet >& _rxDatasource) -{ - // remove all items which relate to indirect properties from the input set - // (without this, the following may happen: select an arbitrary data source where some indirect properties - // are set. Select another data source of the same type, where the indirect props are not set (yet). Then, - // the indirect property values of the first ds are shown in the second ds ...) - const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties(); - for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin(); - aIndirect != rMap.end(); - ++aIndirect - ) - getWriteOutputSet()->ClearItem( (sal_uInt16)aIndirect->first ); - - // extract all relevant data from the property set of the data source - m_pImpl->translateProperties(_rxDatasource, *getWriteOutputSet()); -} -//------------------------------------------------------------------------- -ODbTypeWizDialog::ApplyResult ODbTypeWizDialog::implApplyChanges() -{ - if ( !m_pImpl->saveChanges(*m_pOutSet) ) - return AR_KEEP; - - m_bApplied = sal_True; - - return AR_LEAVE_MODIFIED; -} // ----------------------------------------------------------------------------- const SfxItemSet* ODbTypeWizDialog::getOutputSet() const { @@ -389,7 +362,7 @@ // open our own resource block, as the page titles are strings local to this block LocalResourceAccess aDummy(DLG_DATABASE_ADMINISTRATION, RSC_TABDIALOG); - pPage->SetText(String(ResId(nStringId))); + pPage->SetText(String(ModuleRes(nStringId))); defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH ); enableButtons( WZB_FINISH, _nState == START_PAGE ? sal_False : sal_True); pPage->Show(); @@ -410,6 +383,17 @@ SetText(_sTitle); } //------------------------------------------------------------------------- +void ODbTypeWizDialog::enableConfirmSettings( bool _bEnable ) +{ + enableButtons( WZB_FINISH, _bEnable ); + // TODO: + // this is hacky. At the moment, this method is used in only one case (#b6532894#). + // As soon as it is to be used more wide-spread, we should find a proper concept + // for enabling both the Next and Finish buttons, depending on the current page state. + // Plus, the concept must also care for the case where those pages are embedded into + // anormal tab dialog. +} +//------------------------------------------------------------------------- sal_Bool ODbTypeWizDialog::saveDatasource() { SfxTabPage* pPage = static_cast<SfxTabPage*>(WizardDialog::GetPage(getCurrentState())); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
