diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:30:51 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:30:51 +0000 |
| commit | eeca96277a5b9330b3485f5700da61ccec5a0240 (patch) | |
| tree | 09b893fa4a9add5aa41f155ab9f254be65648571 /desktop | |
| parent | c9a9e1a7d0d54957acea59a3b2d677cb28a2698d (diff) | |
INTEGRATION: CWS fwk82_SRC680 (1.9.302); FILE MERGED
2008/01/09 08:28:54 as 1.9.302.1: #i84169# optimize startup wizard
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/pages.hxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx index 80baf1a93800..4c07744d393c 100644 --- a/desktop/source/migration/pages.hxx +++ b/desktop/source/migration/pages.hxx @@ -4,9 +4,9 @@ * * $RCSfile: pages.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:13:22 $ + * last change: $Author: rt $ $Date: 2008-01-29 16:30:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,6 +54,7 @@ private: FixedText m_ftHead; FixedText m_ftBody; svt::OWizardMachine *m_pParent; + sal_Bool m_bLicenseNeedsAcceptance; enum OEMType { OEM_NONE, OEM_NORMAL, OEM_EXTENDED @@ -65,7 +66,7 @@ private: public: - WelcomePage( svt::OWizardMachine* parent, const ResId& resid); + WelcomePage( svt::OWizardMachine* parent, const ResId& resid, sal_Bool bLicenseNeedsAcceptance ); protected: virtual void ActivatePage(); }; @@ -111,7 +112,7 @@ private: PushButton m_pbDown; sal_Bool m_bLicenseRead; public: - LicensePage( svt::OWizardMachine* parent, const ResId& resid); + LicensePage( svt::OWizardMachine* parent, const ResId& resid, const rtl::OUString &rLicensePath ); private: DECL_LINK(PageDownHdl, PushButton*); DECL_LINK(EndReachedHdl, LicenseView*); |