rpms/openoffice.org/devel workspace.vcl94.patch,1.1,1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20023

Modified Files:
	workspace.vcl94.patch 
Log Message:
add in dtardons extra goodness

workspace.vcl94.patch:

Index: workspace.vcl94.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl94.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.vcl94.patch	24 Sep 2008 07:39:55 -0000	1.1
+++ workspace.vcl94.patch	2 Nov 2008 23:18:47 -0000	1.2
@@ -82,3 +82,46 @@
      FcPattern* pPattern = rWrapper.FcPatternCreate();
  
      OString aLangAttrib;
+--- openoffice.org.orig/vcl/inc/vcl/wrkwin.hxx
++++ openoffice.org/vcl/inc/vcl/wrkwin.hxx
+@@ -82,7 +82,14 @@ public:
+ 
+     virtual BOOL    Close();
+ 
+-    void            ShowFullScreenMode( BOOL bFullScreenMode = TRUE, sal_Int32 nDisplay = 0 );
++    /** The default value of nDisplay = -1 means "don't care" and
++        allows to backends to use any screen [** or display? terminology!]
++        they like (most probably the current one).
++
++        NOTE: The default value cannot be 0, because 0 is a legitimate
++        screen number.
++     */
++    void            ShowFullScreenMode( BOOL bFullScreenMode = TRUE, sal_Int32 nDisplay = -1 );
+ 	void            EndFullScreenMode() { ShowFullScreenMode( FALSE ); }
+     BOOL            IsFullScreenMode() const { return mbFullScreenMode; }
+ 
+diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
+--- openoffice.org.orig/vcl/source/window/wrkwin.cxx
++++ openoffice.org/vcl/source/window/wrkwin.cxx
+@@ -196,6 +196,11 @@ void WorkWindow::ShowFullScreenMode( BOOL bFullScreenMode, sal_Int32 nDisplay )
+     if ( !mbFullScreenMode == !bFullScreenMode )
+         return;
+ 
++    if (nDisplay < 0 || nDisplay >= Application::GetScreenCount())
++    {
++        nDisplay = GetScreenNumber();
++    }
++
+     mbFullScreenMode = bFullScreenMode != 0;
+     if ( !mbSysChild )
+     {
+--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx
++++ openoffice.org/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;