diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:40:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:40:45 +0000 |
| commit | 58b8937f85d0caec9ce26a9c4dcd46914164e074 (patch) | |
| tree | 608b34b14b91afe5d9272b0dd552f58490877892 | |
| parent | 1feefba22c7f56e001734f5100bc4ce4137e7375 (diff) | |
INTEGRATION: CWS odbmacros2 (1.16.114); FILE MERGED
2008/02/11 11:14:55 fs 1.16.114.4: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS
2008/02/04 13:09:12 fs 1.16.114.3: RESYNC: (1.16-1.17); FILE MERGED
2008/01/30 13:19:50 fs 1.16.114.2: canAdvance made const
2008/01/15 09:52:42 fs 1.16.114.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133#
| -rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index fdc38779c4dd..a8cb5c442a02 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gridwizard.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 14:43:12 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:40:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -275,7 +275,7 @@ namespace dbp } //--------------------------------------------------------------------- - WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) + WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const { switch (_nCurrentState) { @@ -364,9 +364,9 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OGridFieldsSelection::determineNextButtonState() + bool OGridFieldsSelection::canAdvance() const { - return sal_False; + return false; // we're the last page in our wizard } @@ -392,7 +392,7 @@ namespace dbp } //--------------------------------------------------------------------- - sal_Bool OGridFieldsSelection::commitPage(IWizardPage::COMMIT_REASON _eReason) + sal_Bool OGridFieldsSelection::commitPage( CommitPageReason _eReason ) { if (!OGridPage::commitPage(_eReason)) return sal_False; |