diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:49:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 17:49:29 +0000 |
| commit | eba34edf4f58c7f21e10bda5267954c98f66b1bf (patch) | |
| tree | 660f7886402987b562045551f5542f6907fa8b23 /desktop | |
| parent | fbc36cefd4bba489e7b0a153d65ff54be036bd0a (diff) | |
INTEGRATION: CWS odbmacros2 (1.17.52); FILE MERGED
2008/03/04 12:04:38 fs 1.17.52.3: RESYNC: (1.18-1.19); FILE MERGED
2008/02/04 13:10:28 fs 1.17.52.2: RESYNC: (1.17-1.18); FILE MERGED
2008/01/15 09:53:32 fs 1.17.52.1: some re-factoring of OWizardMachine, RoadmapWizard and derived classes, to prepare the migration UI for #i49133#
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/migration/wizard.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index e5a7850be070..858b42bbb6fe 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wizard.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2008-02-25 16:49:18 $ + * last change: $Author: kz $ $Date: 2008-03-06 18:49:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -111,7 +111,7 @@ ResMgr *FirstStartWizard::GetResManager() FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAcceptance, const rtl::OUString &rLicensePath ) :RoadmapWizard( pParent, WizardResId(DLG_FIRSTSTART_WIZARD), - WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP, WizardResId(STR_FIRSTSTART_TITLE)) + WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP) ,m_bOverride(sal_False) ,m_aDefaultPath(0) ,m_aMigrationPath(0) @@ -174,7 +174,7 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep bPage_Migration = Migration::checkMigration(); bPage_UpdateCheck = showOnlineUpdatePage(); - Path aPath; + WizardPath aPath; if (bPage_Welcome) aPath.push_back(STATE_WELCOME); if (bPage_License) @@ -305,7 +305,7 @@ TabPage* FirstStartWizard::createPage(WizardState _nState) return pTabPage; } -String FirstStartWizard::getStateDisplayName(WizardState _nState) +String FirstStartWizard::getStateDisplayName( WizardState _nState ) const { String sName; switch(_nState) |