applied_patches/0235-default-no-startup-wizard.diff

   1 --- desktop/source/migration/wizard.cxx.old     2009-04-02 10:56:43.000000000 +0000
   2 +++ desktop/source/migration/wizard.cxx 2009-04-06 16:41:54.000000000 +0000
   3 @@ -116,6 +116,8 @@ FirstStartWizard::FirstStartWizard( Wind
   4      ,m_bAutomaticUpdChk(sal_True)
   5      ,m_aLicensePath( rLicensePath )
   6  {
   7 +    return;
   8 +
   9      // ---
  10      // FreeResource();
  11  //     enableState(STATE_USER, sal_False);
  12 @@ -373,7 +375,11 @@ sal_Bool FirstStartWizard::onFinish(sal_
  13
  14  short FirstStartWizard::Execute()
  15  {
  16 -    return svt::RoadmapWizard::Execute();
  17 +    disableWizard();
  18 +    if ( Migration::checkMigration() )
  19 +        Migration::doMigration();
  20 +
  21 +    return sal_True;
  22  }
  23
  24  static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False)
  25 --- scp2/source/ooo/common_brand.scp.old        2009-04-06 16:41:54.000000000 +0000
  26 +++ scp2/source/ooo/common_brand.scp    2009-04-06 16:41:54.000000000 +0000
  27 @@ -924,19 +924,14 @@ ProfileItem gid_Brand_ProfileItem_Soffic
  28  End
  29  #endif
  30
  31 -#ifdef WNT
  32  ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
  33      ProfileID = gid_Brand_Profile_Soffice_Ini;
  34      ModuleID = gid_Module_Root_Brand;
  35      Section = "Bootstrap";
  36      Order = 7;
  37      Key = "HideEula";
  38 -    Value = "[HIDEEULA]";
  39 -    Inifiletablekey = "HideEula";
  40 -    Inifiletableaction = "1";
  41 -    Styles = (INIFILETABLE);
  42 +    Value = "1";
  43  End
  44 -#endif
  45
  46  ProfileItem gid_Brand_Profileitem_Version_Buildid
  47      ProfileID = gid_Brand_Profile_Version_Ini;