ooo-build r13916 - in branches/ooo-build-3-0: . patches/dev300
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r13916 - in branches/ooo-build-3-0: . patches/dev300
- Date: Wed, 17 Sep 2008 12:35:20 +0000 (UTC)
Author: thorstenb
Date: Wed Sep 17 12:35:20 2008
New Revision: 13916
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13916&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:
branches/ooo-build-3-0/patches/dev300/vcl-fix-screen-number.diff
Modified:
branches/ooo-build-3-0/ChangeLog
branches/ooo-build-3-0/patches/dev300/apply
Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply (original)
+++ branches/ooo-build-3-0/patches/dev300/apply Wed Sep 17 12:35:20 2008
@@ -2620,6 +2620,7 @@
svtools-update-ole.diff, n#411855, thorsten
vcl-logical-bmp-size.diff, i#92902, thorsten
sdext-presenterview-thread-suicide.diff, n#425072, thorsten
+vcl-fix-screen-number.diff, i#93986, thorsten
[ Fixes < dev300-m30 < ooo300-m3 ]
pdfimport-system-poppler-m29.diff, i#92920, cmc
Added: branches/ooo-build-3-0/patches/dev300/vcl-fix-screen-number.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/vcl-fix-screen-number.diff Wed Sep 17 12:35:20 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]