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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 18:57:12 2008
New Revision: 14953
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14953&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/default-no-style-dialog-m37.diff:
	* patches/dev300/default-no-style-dialog.diff:
	* patches/dev300/apply: adjusted for dev300-m38.



Added:
   trunk/patches/dev300/default-no-style-dialog-m37.diff
      - copied unchanged from r14946, /trunk/patches/dev300/default-no-style-dialog.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/default-no-style-dialog.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 18:57:12 2008
@@ -1274,9 +1274,15 @@
 # automatically do any migration we can, with no wizard
 default-no-startup-wizard.diff, michael
 
+[ Defaults < dev300-m38 ]
+# don't throw up the style dialog on 1st run
+default-no-style-dialog-m37.diff, michael
+
+[ Defaults >= dev300-m38 ]
 # don't throw up the style dialog on 1st run
 default-no-style-dialog.diff, michael
 
+[ Defaults ]
 # pestering people serves no useful purpose
 default-no-registration.diff, michael
 

Modified: trunk/patches/dev300/default-no-style-dialog.diff
==============================================================================
--- trunk/patches/dev300/default-no-style-dialog.diff	(original)
+++ trunk/patches/dev300/default-no-style-dialog.diff	Mon Dec 29 18:57:12 2008
@@ -1,16 +1,13 @@
-Index: sfx2/source/appl/appreg.cxx
-===================================================================
-RCS file: /cvs/framework/sfx2/source/appl/appreg.cxx,v
-retrieving revision 1.7
-diff -u -p -u -r1.7 appreg.cxx
---- sfx2/source/appl/appreg.cxx	11 Oct 2002 15:14:20 -0000	1.7
-+++ sfx2/source/appl/appreg.cxx	9 Oct 2003 13:51:03 -0000
-@@ -110,7 +110,7 @@ void SfxApplication::Registrations_Impl(
+diff --git sfx2/source/appl/appreg.cxx sfx2/source/appl/appreg.cxx
+index 721900b..9c833cc 100644
+--- sfx2/source/appl/appreg.cxx
++++ sfx2/source/appl/appreg.cxx
+@@ -70,7 +70,7 @@ void SfxApplication::Registrations_Impl()
  	SfxRecordingFloatWrapper_Impl::RegisterChildWindow();
- 	SfxNavigatorWrapper::RegisterChildWindow();
+ 	SfxNavigatorWrapper::RegisterChildWindow( FALSE, NULL, SFX_CHILDWIN_NEVERHIDE );
  	SfxPartChildWnd_Impl::RegisterChildWindow();
 -	SfxTemplateDialogWrapper::RegisterChildWindow(TRUE);
 +	SfxTemplateDialogWrapper::RegisterChildWindow();
+ 	SfxDockingWrapper::RegisterChildWindow();
  
  	// Controller
- 	SfxToolBoxControl::RegisterControl(SID_REPEAT);