diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:39:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:39:12 +0000 |
| commit | 1907c2a1161a431c0c78436d2f76b8f61a260874 (patch) | |
| tree | 7dd3d74883e289bf5f970aef7084a0c1e86dc064 /extensions | |
| parent | 9fa6c9bc01e20e1ff5c4266ebc29861e62b238a9 (diff) | |
INTEGRATION: CWS odbmacros2 (1.4.424); FILE MERGED
2008/02/11 11:14:55 fs 1.4.424.3: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS
2008/01/30 13:21:09 fs 1.4.424.2: canAdvance made const
2008/01/15 09:52:42 fs 1.4.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/abpilot/admininvokationpage.hxx | 7 | ||||
| -rw-r--r-- | extensions/source/abpilot/tableselectionpage.hxx | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx index be5cbcba8b75..cabdc7e2db21 100644 --- a/extensions/source/abpilot/admininvokationpage.hxx +++ b/extensions/source/abpilot/admininvokationpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: admininvokationpage.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:06:03 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:37:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,11 +63,10 @@ namespace abp protected: // TabDialog overridables virtual void ActivatePage(); - virtual sal_Bool commitPage(COMMIT_REASON _eReason); virtual void initializePage(); // OImportPage overridables - virtual sal_Bool determineNextButtonState(); + virtual bool canAdvance() const; private: DECL_LINK( OnInvokeAdminDialog, void* ); diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx index f23a576c934a..5f0f183fea08 100644 --- a/extensions/source/abpilot/tableselectionpage.hxx +++ b/extensions/source/abpilot/tableselectionpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: tableselectionpage.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:09:56 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:39:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,14 +63,14 @@ namespace abp protected: // OWizardPage overridables virtual void initializePage(); - virtual sal_Bool commitPage(COMMIT_REASON _eReason); + virtual sal_Bool commitPage( CommitPageReason _eReason ); // TabDialog overridables virtual void ActivatePage(); virtual void DeactivatePage(); // OImportPage overridables - virtual sal_Bool determineNextButtonState(); + virtual bool canAdvance() const; private: DECL_LINK( OnTableSelected, void* ); |