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

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jul 28 10:00:53 2008
New Revision: 13412
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13412&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/vcl-gtk-slideshow-crash.diff:
    Fixing an uninitialized struct member, leading to slideshow
    crashes with the gtk plugin.



Added:
   trunk/patches/dev300/vcl-gtk-slideshow-crash.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 28 10:00:53 2008
@@ -2682,6 +2682,7 @@
 config_office-disable-atl.diff, thorsten
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan
+vcl-gtk-slideshow-crash.diff, i#91496, thorsten
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 

Added: trunk/patches/dev300/vcl-gtk-slideshow-crash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-gtk-slideshow-crash.diff	Mon Jul 28 10:00:53 2008
@@ -0,0 +1,20 @@
+--- vcl/unx/gtk/window/gtkframe.cxx	25 Jun 2008 14:35:09 -0000	1.83
++++ vcl/unx/gtk/window/gtkframe.cxx	11 Jul 2008 17:07:48 -0000	1.83.2.1
+@@ -582,6 +582,7 @@ void GtkSalFrame::InitCommon()
+ 
+     //system data
+     SalDisplay* pDisp = GetX11SalData()->GetDisplay();
++    m_aSystemData.nSize 		= sizeof( SystemChildData );
+     m_aSystemData.pDisplay		= pDisp->GetDisplay();
+     m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pWindow->window);
+     m_aSystemData.pSalFrame		= this;
+--- vcl/unx/gtk/window/gtkobject.cxx	24 Jun 2008 11:42:57 -0000	1.14
++++ vcl/unx/gtk/window/gtkobject.cxx	11 Jul 2008 17:07:48 -0000	1.14.2.1
+@@ -59,6 +59,7 @@ GtkSalObject::GtkSalObject( GtkSalFrame*
+ 
+         //system data
+         SalDisplay* pDisp = GetX11SalData()->GetDisplay();
++        m_aSystemData.nSize 		= sizeof( SystemChildData );
+         m_aSystemData.pDisplay		= pDisp->GetDisplay();
+         m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pSocket->window);
+         m_aSystemData.pSalFrame		= NULL;