From 9fa6c9bc01e20e1ff5c4266ebc29861e62b238a9 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 6 Mar 2008 17:38:59 +0000 Subject: [PATCH] INTEGRATION: CWS odbmacros2 (1.7.114); FILE MERGED 2008/02/11 11:14:55 fs 1.7.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.7.114.4: more roadmap/wizard re-factoring: implUpdateNextButton superseded by update(Dialog)TravelUI 2008/02/04 13:09:03 fs 1.7.114.3: RESYNC: (1.7-1.8); FILE MERGED 2008/01/30 13:21:09 fs 1.7.114.2: canAdvance made const 2008/01/15 09:52:42 fs 1.7.114.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133# --- extensions/source/abpilot/tableselectionpage.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 3dfd0b056ee1..7831986fa22d 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tableselectionpage.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 14:34:27 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:38:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,12 +123,12 @@ namespace abp //--------------------------------------------------------------------- IMPL_LINK( TableSelectionPage, OnTableSelected, void*, /*NOTINTERESTEDIN*/ ) { - implCheckNextButton(); + updateDialogTravelUI(); return 0L; } //--------------------------------------------------------------------- - sal_Bool TableSelectionPage::commitPage(COMMIT_REASON _eReason) + sal_Bool TableSelectionPage::commitPage( CommitPageReason _eReason ) { if (!AddressBookSourcePage::commitPage(_eReason)) return sal_False; @@ -140,9 +140,9 @@ namespace abp } //--------------------------------------------------------------------- - sal_Bool TableSelectionPage::determineNextButtonState() + bool TableSelectionPage::canAdvance() const { - return AddressBookSourcePage::determineNextButtonState() + return AddressBookSourcePage::canAdvance() && ( 0 < m_aTableList.GetSelectEntryCount() ); }