applied_patches/0235-crash-startup.diff

   1 --- vcl/source/gdi/makefile.mk.old      2009-04-02 10:44:19.000000000 +0000
   2 +++ vcl/source/gdi/makefile.mk  2009-04-06 16:41:56.000000000 +0000
   3 @@ -115,6 +115,7 @@ SLOFILES=   $(SLO)$/salmisc.obj     \
   4                         $(SLO)$/graphictools.obj
   5
   6  EXCEPTIONSFILES=       $(SLO)$/salmisc.obj     \
   7 +                       $(SLO)$/bitmapex.obj    \
   8                      $(SLO)$/outdev.obj         \
   9                                         $(SLO)$/outdev3.obj     \
  10                                         $(SLO)$/gfxlink.obj             \
  11 --- vcl/unx/gtk/window/gtkframe.cxx.old 2009-04-02 10:44:27.000000000 +0000
  12 +++ vcl/unx/gtk/window/gtkframe.cxx     2009-04-06 16:41:56.000000000 +0000
  13 @@ -1121,9 +1121,15 @@ void GtkSalFrame::SetIcon( USHORT nIcon
  14
  15      for( nIndex = 0; nIndex < sizeof(nOffsets)/ sizeof(USHORT); nIndex++ )
  16      {
  17 -        // #i44723# workaround gcc temporary problem
  18 -        ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
  19 -        BitmapEx aIcon( aResId );
  20 +           // #i44723# workaround gcc temporary problem
  21 +           ResId aResId( nOffsets[nIndex] + nIcon, *ImplGetResMgr() );
  22 +               BitmapEx aIcon;
  23 +           try {
  24 +                   aIcon = BitmapEx( aResId );
  25 +               } catch (com::sun::star::uno::RuntimeException &) {
  26 +                   // UCB not initialized for splash screen creation; very exceptional.
  27 +                   continue;
  28 +               }
  29
  30          // #i81083# convert to 24bit/8bit alpha bitmap
  31          Bitmap aBmp = aIcon.GetBitmap();