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

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Oct  7 13:37:16 2008
New Revision: 14234
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14234&view=rev

Log:
2008-10-07  Rene Engelhard  <rene debian org>

        * patches/dev300/unxplash-rework.diff: fix smoketest (run with
          -no-oosplash)


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff

Modified: branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/unxsplash-rework.diff	Tue Oct  7 13:37:16 2008
@@ -2342,3 +2342,19 @@
  
              //DBG_ASSERT( !mpWindowImpl->mbSuppressAccessibilityEvents, "Window::Show() - Frame reactivated");
              mpWindowImpl->mbSuppressAccessibilityEvents = FALSE;
+Index: smoketest.pl
+===================================================================
+RCS file: /cvs/installation/smoketestoo_native/smoketest.pl,v
+retrieving revision 1.34.6.1
+diff -u -r1.34.6.1 smoketest.pl
+--- smoketestoo_native/smoketest.pl	30 Jul 2008 13:31:30 -0000	1.34.6.1
++++ smoketextoo_native/smoketest.pl	7 Oct 2008 13:30:32 -0000
+@@ -502,7 +502,7 @@
+     if ($ENV{OS} eq "MACOSX") {
+ 		delete $ENV{DYLD_LIBRARY_PATH};
+ 	}
+-	$Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
++	$Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
+ 	if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {
+ 		$Command = "cd \"$programpath\"; " . $Command;
+ 	}