diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:35:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:35:15 +0000 |
| commit | eb0cce55ad5e38842ccce4395da56741ff26a618 (patch) | |
| tree | c41116106e26ae1de8cfe50ed2a5e51a7fa07cdf /extensions | |
| parent | 6c303ea0a4c6927f791c973ae685390293738f6f (diff) | |
INTEGRATION: CWS odbmacros2 (1.5.424); FILE MERGED
2008/02/11 11:14:55 fs 1.5.424.3: IWizardPage is COMMIT_REASON is deprecated - replace usages with CommitPageReason, while I have an svtools-incompatible CWS
2008/01/30 13:20:59 fs 1.5.424.2: #i49133# outsourced the handling of the location of the new database to a dedicated class (::svx::DatabaseLocationInputController)
2008/01/15 09:52:42 fs 1.5.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/abpfinalpage.hxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index cb07192935ea..1fd26ee0d3d2 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -4,9 +4,9 @@ * * $RCSfile: abpfinalpage.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:02:29 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:35:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,18 +36,12 @@ #ifndef EXTENSIONS_ABP_ABPFINALPAGE_HXX #define EXTENSIONS_ABP_ABPFINALPAGE_HXX -#ifndef EXTENSIONS_ABP_ABSPAGE_HXX #include "abspage.hxx" -#endif -#ifndef _SV_EDIT_HXX -#include <vcl/edit.hxx> -#endif -#ifndef EXTENSIONS_ABP_ABPTYPES_HXX #include "abptypes.hxx" -#endif -#ifndef SVTOOLS_URLCONTROL_HXX + #include <svtools/urlcontrol.hxx> -#endif +#include <svx/databaselocationinput.hxx> +#include <vcl/edit.hxx> //......................................................................... namespace abp @@ -69,8 +63,10 @@ namespace abp Edit m_aName; FixedText m_aDuplicateNameError; + ::svx::DatabaseLocationInputController + m_aLocationController; + StringBag m_aInvalidDataSourceNames; - sal_Bool m_bCheckFileName; public: FinalPage( OAddessBookSourcePilot* _pParent ); @@ -78,18 +74,17 @@ 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( OnNameModified, Edit* ); - DECL_LINK( OnBrowse, PushButton* ); DECL_LINK( OnRegister, CheckBox* ); sal_Bool isValidName() const; |