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

[thorstenb svn gnome org]

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

Log:
    * patches/dev300/apply: 
    * patches/dev300/vcl-fix-gtk-fullscreen-crash.diff: fix another
    dual-head crash, patch courtesy dtardon



Added:
   trunk/patches/dev300/vcl-fix-gtk-fullscreen-crash.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 14:33:22 2008
@@ -2631,7 +2631,8 @@
 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
+vcl-fix-screen-number.diff, n#426521, i#93986, thorsten
+vcl-fix-gtk-fullscreen-crash.diff, i#93805, dtardon
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/vcl-fix-gtk-fullscreen-crash.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-fix-gtk-fullscreen-crash.diff	Wed Sep 17 14:33:22 2008
@@ -0,0 +1,32 @@
+--- vcl/inc/vcl/wrkwin.hxx
++++ 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; }
+ 
+--- vcl/source/window/wrkwin.cxx
++++ 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 )
+     {