[ooo-build-commit] 2 commits - extensions/tweakconfig patches/dev300

[Thorsten Behrens]

 extensions/tweakconfig/Makefile.am        |    4 ++
 patches/dev300/apply                      |    1 
 patches/dev300/vcl-startup-crash-fix.diff |   58 ++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+)

New commits:
commit 0fda923902e0f7b64a2173a401bfa46eac0ebf93
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Jun 26 19:22:51 2009 +0200

    Fix early startup race in generic vcl plug
    
    * patches/dev300/apply: added the patch
    * patches/dev300/vcl-startup-crash-fix.diff: guarding
      SelectAppIconPixmap() call in the frame init with a catchall,
      sometimes ucb is not available yet during splashscreen display

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9e4abc3..dae4178 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3206,6 +3206,7 @@ ubuntu-gnome-fpicker-gfile-fuse.diff, ccheney
 configmgr-validate-removedtree.diff, n#505704
 svx-fix-fit-to-frame-crash.diff, n#508621, rodo
 vcl-gtk-fullscreen-fix.diff, n#480324, thorsten
+vcl-startup-crash-fix.diff, i#103148, thorsten
 
 # adds various color conversion functions to basegfx's BColor
 basegfx-color-tools.diff, thorsten
diff --git a/patches/dev300/vcl-startup-crash-fix.diff b/patches/dev300/vcl-startup-crash-fix.diff
new file mode 100644
index 0000000..19fd373
--- /dev/null
+++ b/patches/dev300/vcl-startup-crash-fix.diff
@@ -0,0 +1,58 @@
+Early-startup crash due to non-initialized ucb
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ vcl/unx/source/window/salframe.cxx |   28 ++++++++++++++++++++--------
+ 1 files changed, 20 insertions(+), 8 deletions(-)
+
+
+diff --git vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salframe.cxx
+index c5bd4e2..26a88ea 100644
+--- vcl/unx/source/window/salframe.cxx
++++ vcl/unx/source/window/salframe.cxx
+@@ -71,6 +71,7 @@
+ #include <i18n_ic.hxx>
+ #include <i18n_keysym.hxx>
+ #include <i18n_status.hxx>
++#include <com/sun/star/uno/Exception.hpp>
+ 
+ #include <algorithm>
+ 
+@@ -424,15 +425,26 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
+         if( IsOverrideRedirect() )
+             Attributes.override_redirect = True;
+         // default icon
+-        if( (nStyle_ & SAL_FRAME_STYLE_INTRO) == 0 &&
+-            SelectAppIconPixmap( pDisplay_, m_nScreen,
+-                                 mnIconID != 1 ? mnIconID : 
+-                                 (mpParent ? mpParent->mnIconID : 1), 32,
+-                                 Hints.icon_pixmap, Hints.icon_mask ))
++        if( (nStyle_ & SAL_FRAME_STYLE_INTRO) == 0 )
+         {
+-            Hints.flags		|= IconPixmapHint;
+-            if( Hints.icon_mask )
+-                Hints.flags	|= IconMaskHint;
++            bool bOk=false;
++            try
++            {
++                bOk=SelectAppIconPixmap( pDisplay_, m_nScreen,
++                                         mnIconID != 1 ? mnIconID : 
++                                         (mpParent ? mpParent->mnIconID : 1), 32,
++                                         Hints.icon_pixmap, Hints.icon_mask );
++            }
++            catch( com::sun::star::uno::Exception& )
++            {
++                // can happen - no ucb during early startup
++            }
++            if( bOk )
++            {
++                Hints.flags		|= IconPixmapHint;
++                if( Hints.icon_mask )
++                    Hints.flags	|= IconMaskHint;
++            }
+         }
+ 
+ 		// find the top level frame of the transience hierarchy
commit 7a8067d6c511e323bfcdb31d3c8f7f54cf9bfa84
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Wed Jun 24 21:24:29 2009 +0200

    Aligned tweakconfig's make targets
    
    * extensions/tweakconfig/Makefile.am: added clean-local target

diff --git a/extensions/tweakconfig/Makefile.am b/extensions/tweakconfig/Makefile.am
index 7a99c63..90b28a2 100644
--- a/extensions/tweakconfig/Makefile.am
+++ b/extensions/tweakconfig/Makefile.am
@@ -8,3 +8,7 @@ $(BUILDDIR)/bin/tweakconfig.oxt: *.xcu *.xml
 	zip $@ $(BUILDDIR)/bin/tweakconfig/*.xcu $(BUILDDIR)/bin/tweakconfig/*.xml 
 
 all: tweakconfig
+
+clean-local:
+	rm -f $(BUILDDIR)/bin/tweakconfig.oxt
+	rm -rf $(BUILDDIR)/bin/tweakconfig