ooo-build r14919 - in branches/ooo-build-3-0-1: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 24 16:38:07 2008
New Revision: 14919
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14919&view=rev

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

	* patches/dev300/sfx2-remove-check-update-on-fileload.diff: backported 
	the fix from trunk.
	
	* patches/dev300/apply:	uncomment the patch.


Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/sfx2-remove-check-update-on-fileload.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Dec 24 16:38:07 2008
@@ -852,7 +852,7 @@
 # Remove unnecessary popups that might show up during startup.
 
 # remove updater code that is only relevant for the upstream version.
-#FIXME#sfx2-remove-check-update-on-fileload.diff, kohei
+sfx2-remove-check-update-on-fileload.diff, kohei
 
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei

Modified: branches/ooo-build-3-0-1/patches/dev300/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/sfx2-remove-check-update-on-fileload.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/sfx2-remove-check-update-on-fileload.diff	Wed Dec 24 16:38:07 2008
@@ -1,24 +1,8 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj uui/source/newerverwarn.cxx uui/source/newerverwarn.cxx
---- uui/source/newerverwarn.cxx	2008-05-06 23:56:41.000000000 -0400
-+++ uui/source/newerverwarn.cxx	2008-05-07 00:00:36.000000000 -0400
-@@ -58,6 +58,7 @@ namespace lang  = ::com::sun::star::lang
- 
- #define DEFINE_CONST_UNICODE( CONSTASCII )  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONSTASCII ) )
- 
-+#if 0
- namespace uui
- {
- 
-@@ -160,4 +161,5 @@ void NewerVersionWarningDialog::InitButt
- }
- 
- } // end of namespace uui
-+#endif
- 
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj sfx2.clean/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
---- sfx2.clean/source/doc/objstor.cxx	2008-05-06 23:56:40.000000000 -0400
-+++ sfx2/source/doc/objstor.cxx	2008-05-06 23:59:24.000000000 -0400
-@@ -1082,6 +1082,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
+diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx
+index a92ff91..fb727a8 100644
+--- sfx2/source/doc/objstor.cxx
++++ sfx2/source/doc/objstor.cxx
+@@ -1011,6 +1011,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
              }
          }
  
@@ -26,7 +10,7 @@
          uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
          if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
          {
-@@ -1125,6 +1126,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
+@@ -1073,6 +1074,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
                  }
              }
          }
@@ -34,22 +18,3 @@
      }
      else
          GetpApp()->HideStatusText();
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj uui/source/newerverwarn.hxx uui/source/newerverwarn.hxx
---- uui/source/newerverwarn.hxx	2008-05-06 23:56:41.000000000 -0400
-+++ uui/source/newerverwarn.hxx	2008-05-06 23:59:58.000000000 -0400
-@@ -39,6 +39,7 @@
- 
- #define RET_ASK_LATER   short( 100 )
- 
-+#if 0
- namespace uui
- {
-     class NewerVersionWarningDialog : public SfxModalDialog
-@@ -60,6 +61,7 @@ namespace sfx2
-         ~NewerVersionWarningDialog();
-     };
- } // namespace uui
-+#endif
- 
- #endif // #ifndef _NEWERVERSIONWARNING_HXX
-