ooo-build r15276 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Feb  2 17:20:26 2009
New Revision: 15276
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15276&view=rev

Log:
2009-02-02  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/desktop-disable-startup-registration.diff: disable the
	entire first start wizard instead of just the update reminder bit, since
	we don't need the whole first start wizard thingie.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/desktop-disable-startup-registration.diff

Modified: trunk/patches/dev300/desktop-disable-startup-registration.diff
==============================================================================
--- trunk/patches/dev300/desktop-disable-startup-registration.diff	(original)
+++ trunk/patches/dev300/desktop-disable-startup-registration.diff	Mon Feb  2 17:20:26 2009
@@ -1,14 +1,28 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=desktop.vpj desktop.clean/source/app/app.cxx desktop/source/app/app.cxx
---- desktop.clean/source/app/app.cxx	2008-05-16 15:26:26.000000000 -0400
-+++ desktop/source/app/app.cxx	2008-05-16 15:26:38.000000000 -0400
-@@ -1752,8 +1752,10 @@ void Desktop::Main()
-                 }
-             }
+diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx
+index b1645eb..d3a3fc8 100644
+--- desktop/source/app/app.cxx
++++ desktop/source/app/app.cxx
+@@ -47,6 +47,7 @@
+ #include "desktopcontext.hxx"
+ #include "exithelper.hxx"
+ #include "../migration/pages.hxx"
++#include "../migration/migration.hxx"
+ 
+ #include <svtools/javacontext.hxx>
+ #include <com/sun/star/frame/XSessionManagerListener.hpp>
+@@ -1394,6 +1395,7 @@ void Desktop::Main()
+         tools::InitTestToolLib();
+         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} tools::InitTestToolLib" );
+ 
++#if 0 // ooo-build doesn't use First Start Wizard at all.
+         // First Start Wizard allowed ?
+         if ( ! pCmdLineArgs->IsNoFirstStartWizard())
+         {
+@@ -1425,6 +1427,7 @@ void Desktop::Main()
+             
+             RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
          }
-+#if 0
-         else if ( RegistrationPage::hasReminderDateCome() )
-             RegistrationPage::executeSingleMode();
 +#endif
  
-         RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" );
- 
+ 		// keep a language options instance...
+ 		pLanguageOptions.reset( new SvtLanguageOptions(sal_True));