diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:42:07 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:42:07 +0000 |
commit | e811f031cfb312112d9d46d82254840046836f3e (patch) | |
tree | 9b21f12b0c2988c59fad0f12ca095aead204e224 /extensions | |
parent | 692d62dfbcf349f4e7716ccce00b792b61ca81f9 (diff) |
INTEGRATION: CWS odbmacros2 (1.7.424); FILE MERGED
2008/02/11 11:14:56 fs 1.7.424.3: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS
2008/01/30 13:19:51 fs 1.7.424.2: canAdvance made const
2008/01/15 09:52:42 fs 1.7.424.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.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index 44b20fccf7a7..f5cf83733df0 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -4,9 +4,9 @@ * * $RCSfile: listcombowizard.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:31:40 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:42:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -89,7 +89,7 @@ namespace dbp protected: // OWizardMachine overridables virtual ::svt::OWizardPage* createPage( WizardState _nState ); - virtual WizardState determineNextState( WizardState _nCurrentState ); + virtual WizardState determineNextState( WizardState _nCurrentState ) const; virtual void enterState( WizardState _nState ); virtual sal_Bool leaveState( WizardState _nState ); @@ -141,8 +141,8 @@ namespace dbp // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage(COMMIT_REASON _eReason); - sal_Bool determineNextButtonState(); + virtual sal_Bool commitPage( CommitPageReason _eReason ); + virtual bool canAdvance() const; protected: DECL_LINK( OnTableDoubleClicked, ListBox* ); @@ -175,8 +175,8 @@ namespace dbp // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage(COMMIT_REASON _eReason); - sal_Bool determineNextButtonState(); + virtual sal_Bool commitPage( CommitPageReason _eReason ); + virtual bool canAdvance() const; }; //===================================================================== @@ -202,8 +202,8 @@ namespace dbp // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage(COMMIT_REASON _eReason); - sal_Bool determineNextButtonState(); + virtual sal_Bool commitPage( CommitPageReason _eReason ); + virtual bool canAdvance() const; private: void implCheckFinish(); @@ -226,7 +226,7 @@ namespace dbp virtual void ActivatePage(); // OWizardPage overridables - virtual sal_Bool determineNextButtonState(); + virtual bool canAdvance() const; // ODBFieldPage overridables virtual String& getDBFieldSetting(); |