diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:41:50 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:41:50 +0000 |
commit | 692d62dfbcf349f4e7716ccce00b792b61ca81f9 (patch) | |
tree | 8f57e62d70000b30cb62506a9527174c8cc0ac9a /extensions | |
parent | d9618ff4379f12ac23a655cd19f6101433d6c735 (diff) |
INTEGRATION: CWS odbmacros2 (1.19.114); FILE MERGED
2008/02/11 11:14:56 fs 1.19.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.19.114.4: more roadmap/wizard re-factoring: implUpdateNextButton superseded by update(Dialog)TravelUI
2008/02/04 13:09:19 fs 1.19.114.3: RESYNC: (1.19-1.20); FILE MERGED
2008/01/30 13:19:51 fs 1.19.114.2: canAdvance made const
2008/01/15 09:52:42 fs 1.19.114.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133#
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/dbpilots/listcombowizard.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 5d84a7478462..cc55b4b70d16 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: listcombowizard.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 14:43:39 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:41:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -151,7 +151,7 @@ namespace dbp } //--------------------------------------------------------------------- - WizardTypes::WizardState OListComboWizard::determineNextState(WizardState _nCurrentState) + WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) { @@ -351,10 +351,10 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OContentTableSelection::determineNextButtonState() + bool OContentTableSelection::canAdvance() const { - if (!OLCPage::determineNextButtonState()) - return sal_False; + if (!OLCPage::canAdvance()) + return false; return 0 != m_aSelectTable.GetSelectEntryCount(); } @@ -362,7 +362,7 @@ namespace dbp //--------------------------------------------------------------------- IMPL_LINK( OContentTableSelection, OnTableSelected, ListBox*, /*_pListBox*/ ) { - implCheckNextButton(); + updateDialogTravelUI(); return 0L; } @@ -398,14 +398,14 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OContentTableSelection::commitPage(IWizardPage::COMMIT_REASON _eReason) + sal_Bool OContentTableSelection::commitPage( CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) return sal_False; OListComboSettings& rSettings = getSettings(); rSettings.sListContentTable = m_aSelectTable.GetSelectEntry(); - if (!rSettings.sListContentTable.Len() && (IWizardPage::CR_TRAVEL_PREVIOUS != _eReason)) + if (!rSettings.sListContentTable.Len() && (eTravelBackward != _eReason)) // need to select a table return sal_False; @@ -451,10 +451,10 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OContentFieldSelection::determineNextButtonState() + bool OContentFieldSelection::canAdvance() const { - if (!OLCPage::determineNextButtonState()) - return sal_False; + if (!OLCPage::canAdvance()) + return false; return 0 != m_aSelectTableField.GetSelectEntryCount(); } @@ -470,13 +470,13 @@ namespace dbp //--------------------------------------------------------------------- IMPL_LINK( OContentFieldSelection, OnFieldSelected, ListBox*, /*NOTINTERESTEDIN*/ ) { - implCheckNextButton(); + updateDialogTravelUI(); m_aDisplayedField.SetText(m_aSelectTableField.GetSelectEntry()); return 0L; } //--------------------------------------------------------------------- - sal_Bool OContentFieldSelection::commitPage(IWizardPage::COMMIT_REASON _eReason) + sal_Bool OContentFieldSelection::commitPage( CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) return sal_False; @@ -532,10 +532,10 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OLinkFieldsPage::determineNextButtonState() + bool OLinkFieldsPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... - return sal_False; + return false; } //--------------------------------------------------------------------- @@ -554,7 +554,7 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OLinkFieldsPage::commitPage(IWizardPage::COMMIT_REASON _eReason) + sal_Bool OLinkFieldsPage::commitPage( CommitPageReason _eReason ) { if (!OLCPage::commitPage(_eReason)) return sal_False; @@ -589,10 +589,10 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OComboDBFieldPage::determineNextButtonState() + bool OComboDBFieldPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... - return sal_False; + return false; } //......................................................................... |