INTEGRATION: CWS odbmacros2 (1.15.114); FILE MERGED
2008/02/11 11:14:55 fs 1.15.114.5: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS 2008/02/04 20:02:16 fs 1.15.114.4: more roadmap/wizard re-factoring: implUpdateNextButton superseded by update(Dialog)TravelUI 2008/02/04 13:09:09 fs 1.15.114.3: RESYNC: (1.15-1.16); FILE MERGED 2008/01/30 13:19:50 fs 1.15.114.2: canAdvance made const 2008/01/15 09:52:42 fs 1.15.114.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133#
This commit is contained in:
parent
a2589bb51b
commit
82c4cc44c7
1 changed files with 10 additions and 10 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: commonpagesdbp.cxx,v $
|
||||
*
|
||||
* $Revision: 1.16 $
|
||||
* $Revision: 1.17 $
|
||||
*
|
||||
* last change: $Author: ihi $ $Date: 2008-01-14 14:42:36 $
|
||||
* last change: $Author: kz $ $Date: 2008-03-06 18:40:10 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -147,16 +147,16 @@ namespace dbp
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
sal_Bool OTableSelectionPage::determineNextButtonState()
|
||||
bool OTableSelectionPage::canAdvance() const
|
||||
{
|
||||
if (!OControlWizardPage::determineNextButtonState())
|
||||
return sal_False;
|
||||
if (!OControlWizardPage::canAdvance())
|
||||
return false;
|
||||
|
||||
if (0 == m_aDatasource.GetSelectEntryCount())
|
||||
return sal_False;
|
||||
return false;
|
||||
|
||||
if (0 == m_aTable.GetSelectEntryCount())
|
||||
return sal_False;
|
||||
return false;
|
||||
|
||||
return sal_True;
|
||||
}
|
||||
|
@ -211,7 +211,7 @@ namespace dbp
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
sal_Bool OTableSelectionPage::commitPage(IWizardPage::COMMIT_REASON _eReason)
|
||||
sal_Bool OTableSelectionPage::commitPage( CommitPageReason _eReason )
|
||||
{
|
||||
if (!OControlWizardPage::commitPage(_eReason))
|
||||
return sal_False;
|
||||
|
@ -291,7 +291,7 @@ namespace dbp
|
|||
{
|
||||
}
|
||||
|
||||
implCheckNextButton();
|
||||
updateDialogTravelUI();
|
||||
|
||||
return 0L;
|
||||
}
|
||||
|
@ -538,7 +538,7 @@ namespace dbp
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------
|
||||
sal_Bool ODBFieldPage::commitPage(IWizardPage::COMMIT_REASON _eReason)
|
||||
sal_Bool ODBFieldPage::commitPage( CommitPageReason _eReason )
|
||||
{
|
||||
if (!OMaybeListSelectionPage::commitPage(_eReason))
|
||||
return sal_False;
|
||||
|
|
Loading…
Reference in a new issue