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

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Sep 17 12:33:22 2008
New Revision: 13915
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13915&view=rev

Log:
    * patches/dev300/apply: 
    * patches/dev300/vcl-fix-screen-number.diff: fixed a nasty wrong
    screen number for the gtk plugin, leads to nasty X errors on
    multi-head setups (i#93986).



Added:
   trunk/patches/dev300/vcl-fix-screen-number.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Sep 17 12:33:22 2008
@@ -2631,6 +2631,7 @@
 ppt-continuous-numbering-fix.diff, n#411565, thorsten
 o3tl-fix-warnings.diff, i#92941, cmc
 sdext-presenterview-thread-suicide.diff, n#425072, thorsten
+vcl-fix-screen-number.diff, i#93986, thorsten
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/vcl-fix-screen-number.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-fix-screen-number.diff	Wed Sep 17 12:33:22 2008
@@ -0,0 +1,16 @@
+ vcl/unx/gtk/window/gtkframe.cxx |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+
+diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
+index 3c0fa43..efe3448 100644
+--- vcl/unx/gtk/window/gtkframe.cxx
++++ vcl/unx/gtk/window/gtkframe.cxx
+@@ -1624,6 +1624,7 @@ void GtkSalFrame::moveToScreen( int nScreen )
+         GtkSalDisplay* pDisp = getDisplay();
+         m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pWindow->window);
+         m_aSystemData.pVisual		= pDisp->GetVisual( m_nScreen ).GetVisual();
++        m_aSystemData.nScreen		= nScreen;
+         m_aSystemData.nDepth		= pDisp->GetVisual( m_nScreen ).GetDepth();
+         m_aSystemData.aColormap		= pDisp->GetColormap( m_nScreen ).GetXColormap();
+         m_aSystemData.pAppContext	= NULL;