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

[pmladek svn gnome org]

Author: pmladek
Date: Fri May 23 20:23:46 2008
New Revision: 12652
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12652&view=rev

Log:
2008-05-23  Petr Mladek  <pmladek suse cz>

	* patches/src680/sfx2-remove-check-update-on-fileload.diff:
	* patches/src680/sfx2-remove-check-update-on-fileload-m14.diff:
	* patches/src680/apply: fix to apply in the right context in ooh680-m15



Added:
   branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload-m14.diff   (props changed)
      - copied unchanged from r12650, /branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply
   branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Fri May 23 20:23:46 2008
@@ -847,12 +847,16 @@
 [ PopupRemoval ]
 # Remove unnecessary popups that might show up during startup.
 
-# remove updater code that is only relevant for the upstream version.
-sfx2-remove-check-update-on-fileload.diff, kohei
-
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei
 
+[ PopupRemoval > ooh680-m14 ]
+# remove updater code that is only relevant for the upstream version.
+sfx2-remove-check-update-on-fileload.diff, kohei
+
+[ PopupRemoval <= ooh680-m14 ]
+# remove updater code that is only relevant for the upstream version.
+sfx2-remove-check-update-on-fileload-m14.diff, kohei
 
 [ EasterEgg ]
 # go-oo.org people active in this release

Modified: branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/sfx2-remove-check-update-on-fileload.diff	Fri May 23 20:23:46 2008
@@ -26,14 +26,24 @@
          // --> 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
+@@ -1122,16 +1122,17 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedi
+                         // ODF version greater than 1.1 - added some decimal places to be safe against floating point conversion errors (hack)
+                         sfx2::NewerVersionWarningDialog aDlg( NULL );
+                         aDlg.Execute();
+                     }
                  }
              }
+ 			SetModified(sal_False);		// #i87555
          }
 +#endif
      }
      else
          GetpApp()->HideStatusText();
+ 
+ 	return bOk;
+ }
+ 
+ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc )
 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