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

[michael svn gnome org]

Author: michael
Date: Fri Mar 13 09:44:36 2009
New Revision: 15532
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15532&view=rev

Log:
2009-03-13  Michael Meeks  <michael meeks novell com>

        * patches/dev300/crash-startup.diff,
        * patches/dev300/apply: don't crash on startup, with the gtk+
        plugin, when launched manually for debugging.



Added:
   trunk/patches/dev300/crash-startup.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar 13 09:44:36 2009
@@ -452,6 +452,9 @@
 buildfix-fmtargs.diff, cabral
 
 [ Fixes ]
+# don't throw an exception we can't catch when throwing up the splash.
+crash-startup.diff, i#100171, michael
+
 # FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael

Added: trunk/patches/dev300/crash-startup.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/crash-startup.diff	Fri Mar 13 09:44:36 2009
@@ -0,0 +1,36 @@
+diff -u -r ../HEAD/build/ooo310-m4/vcl/source/gdi/makefile.mk vcl/source/gdi/makefile.mk
+--- vcl/source/gdi/makefile.mk	2009-03-11 11:56:22.000000000 +0000
++++ vcl/source/gdi/makefile.mk	2009-03-13 09:37:20.000000000 +0000
+@@ -115,6 +115,7 @@
+ 			$(SLO)$/graphictools.obj
+ 
+ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
++			$(SLO)$/bitmapex.obj	\
+                     $(SLO)$/outdev.obj		\
+ 					$(SLO)$/outdev3.obj 	\
+ 					$(SLO)$/gdimtf.obj 	\
+
+
+diff -u -r ../HEAD/build/ooo310-m4/vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
+--- vcl/unx/gtk/window/gtkframe.cxx	2009-03-11 11:56:13.000000000 +0000
++++ vcl/unx/gtk/window/gtkframe.cxx	2009-03-13 09:34:37.000000000 +0000
+@@ -1111,9 +1111,15 @@
+     
+     for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ )
+     {
+-        // #i44723# workaround gcc temporary problem
+-        ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
+-        BitmapEx aIcon( aResId );
++	    // #i44723# workaround gcc temporary problem
++	    ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
++		BitmapEx aIcon;
++	    try {
++		    aIcon = BitmapEx( aResId );
++		} catch (com::sun::star::uno::RuntimeException &) {
++		    // UCB not initialized for splash screen creation; very exceptional.
++		    continue;
++		}
+ 
+         // #i81083# convert to 24bit/8bit alpha bitmap
+         Bitmap aBmp = aIcon.GetBitmap();
+