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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 16 14:47:03 2008
New Revision: 14873
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14873&view=rev

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

	* patches/dev300/sfx2-remove-check-update-on-fileload.diff: finally got
	around to fixing this patch.  In the latest 3.1 branch the warning 
	dialog uses UNO API instead of the old internal dialog, which is why 
	the patch didn't apply.
	
	* patches/dev300/apply: re-enable this patch.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 16 14:47:03 2008
@@ -950,10 +950,7 @@
 # Remove unnecessary popups that might show up during startup.
 
 # remove updater code that is only relevant for the upstream version.
-# FIXME 2008-11-28: kohei, please check what has happened to the
-# affected code in dev300-m36, at least the file
-# sfx2/source/dialog/newerverwarn.cxx is not there any longer
-#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: trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff	(original)
+++ trunk/patches/dev300/sfx2-remove-check-update-on-fileload.diff	Tue Dec 16 14:47:03 2008
@@ -1,32 +1,16 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sfx2.vpj sfx2.clean/source/dialog/newerverwarn.cxx sfx2/source/dialog/newerverwarn.cxx
---- sfx2.clean/source/dialog/newerverwarn.cxx	2008-05-06 23:56:41.000000000 -0400
-+++ sfx2/source/dialog/newerverwarn.cxx	2008-05-07 00:00:36.000000000 -0400
-@@ -58,6 +58,7 @@ namespace lang  = ::com::sun::star::lang
- 
- using namespace com::sun::star::system;
- 
-+#if 0
- namespace sfx2
- {
- 
-@@ -160,4 +161,5 @@ void NewerVersionWarningDialog::InitButt
- }
- 
- } // end of namespace sfx2
-+#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 )
              }
          }
  
 +#if 0
-         if ( pMedium->GetInteractionHandler().is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
+         uno::Reference< XInteractionHandler > xHandler( pMedium->GetInteractionHandler() );
+         if ( xHandler.is() && !SFX_APP()->Get_Impl()->bODFVersionWarningLater )
          {
-             // scan the generator string (within meta.xml)
-@@ -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 sfx2.clean/source/inc/newerverwarn.hxx sfx2/source/inc/newerverwarn.hxx
---- sfx2.clean/source/inc/newerverwarn.hxx	2008-05-06 23:56:41.000000000 -0400
-+++ sfx2/source/inc/newerverwarn.hxx	2008-05-06 23:59:58.000000000 -0400
-@@ -39,6 +39,7 @@
- #include <vcl/fixed.hxx>
- #include <sfx2/basedlgs.hxx>
- 
-+#if 0
- namespace sfx2
- {
-     class NewerVersionWarningDialog : public SfxModalDialog
-@@ -60,6 +61,7 @@ namespace sfx2
-         ~NewerVersionWarningDialog();
-     };
- } // namespace sfx2
-+#endif
- 
- #endif // #ifndef _SFX2_NEWERVERSIONWARNING_HXX
-