diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:37:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 14:37:01 +0000 |
| commit | 0f24d566730c39836b40025c1ba6291987859230 (patch) | |
| tree | 88ae7b20380455e50546ea3811b3251ec307e022 /desktop/source/migration/wizard.cxx | |
| parent | 62e0c7026d13eda6145229c833a7b7ec4c5a42ab (diff) | |
INTEGRATION: CWS os2port01 (1.7.12); FILE MERGED
2007/08/10 08:36:30 obr 1.7.12.2: RESYNC: (1.7-1.15); FILE MERGED
2006/12/28 14:54:20 ydario 1.7.12.1: OS/2 initial import.
Diffstat (limited to 'desktop/source/migration/wizard.cxx')
| -rw-r--r-- | desktop/source/migration/wizard.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 42ca920e82..41fc8e6c83 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -4,9 +4,9 @@ * * $RCSfile: wizard.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2007-07-06 12:37:06 $ + * last change: $Author: vg $ $Date: 2007-09-20 15:37:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -366,7 +366,9 @@ sal_Bool FirstStartWizard::onFinish(sal_Int32 _nResult) // return sal_True; if (svt::RoadmapWizard::onFinish(_nResult)) { +#ifndef OS2 // cannot enable quickstart on first startup, see shutdownicon.cxx comments. enableQuickstart(); +#endif disableWizard(); return sal_True; } @@ -748,7 +750,7 @@ OUString FirstStartWizard::getLicensePath() aLangString += aLocale.Variant; } } -#ifdef WNT +#if defined(WNT) || defined(OS2) aLicensePath = aBaseInstallPath + OUString::createFromAscii(szLicensePath) + OUString::createFromAscii(szWNTLicenseName) |