ooo-build r12482 - in branches/ooo-build-2-4: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed May  7 04:20:13 2008
New Revision: 12482
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12482&view=rev

Log:
2008-05-07  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sfx2-remove-check-update-on-fileload.diff: remove check
	update dialog on file load that shows up when the file's ODF version
	is newer.  It is only relevant to the upstream version.

	* patches/src680/apply: apply this patch.


Added:
   branches/ooo-build-2-4/patches/src680/sfx2-remove-check-update-on-fileload.diff
Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Wed May  7 04:20:13 2008
@@ -14,7 +14,8 @@
 	 Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, \
 	 Layout, VBABits, VBAObjects, CalcErrors, Store, CJK, GCJ, Lwp, \
-	 OOXML, ImpressFixes, SVGImport, AutoCorrectCapsLock, UnitTesting
+	 OOXML, ImpressFixes, SVGImport, AutoCorrectCapsLock, UnitTesting, \
+     UpdaterRemoval
 
 LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, SystemBits, \
@@ -812,6 +813,11 @@
 scroll-accel-sc.diff, n#375909, i#71362, kohei
 scroll-accel-vcl.diff, n#375909, i#71362, kohei
 
+[ UpdaterRemoval ]
+# remove updater code that is only relevant for the upstream version.
+sfx2-remove-check-update-on-fileload.diff, kohei
+
+
 [ EasterEgg ]
 # go-oo.org people active in this release
 go-oo-team.diff, michael

Added: branches/ooo-build-2-4/patches/src680/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/sfx2-remove-check-update-on-fileload.diff	Wed May  7 04:20:13 2008
@@ -0,0 +1,55 @@
+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
+ namespace uno   = ::com::sun::star::uno;
+ namespace util  = ::com::sun::star::util;
+ 
++#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
+             }
+         }
+ 
++#if 0
+         // --> PB 2007-11-20 #i83653# Give warning if document contains features from new ODF version
+         // Online Update Check enabled?
+         sal_Bool bOnlineUpdateEnabled = sal_False;
+@@ -1125,6 +1126,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
+                 }
+             }
+         }
++#endif
+     }
+     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
+