[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                       |    4 ++--
 patches/dev300/vcl-fullscreenmode-fix.diff |   13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit b7978f95483f9eee8c6a0f4e029f455e158bf8ab
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 26 22:25:23 2009 +0100

    Fix fullscreen corner case generic plug, add issue ids
    
    * patches/dev300/apply: added upstream issue ids i#107248 and
      i#107249 to vcl-fullscreenmode-fix.diff and
      vcl-free-renderpicture.diff
    * patches/dev300/vcl-fullscreenmode-fix.diff: don't set alwaysOnTop
      for fullscreen windows, extremely un-handy when doing a demo.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 839c177..57ebfd6 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3407,9 +3407,9 @@ ppt-customshape-shading-fix.diff, i#102797, thorsten
 # proper PS output of bezier lines
 psprint-bezier-fix.diff, n#553219, thorsten
 # fix RenderBadPicture crash in xinerama cases
-vcl-free-renderpicture.diff, thorsten
+vcl-free-renderpicture.diff, i#107248, thorsten
 # fix fullscreen window manager hints
-vcl-fullscreenmode-fix.diff, n#551402, thorsten
+vcl-fullscreenmode-fix.diff, n#551402, i#107249, thorsten
 
 [ NLPSolverBits ]
 # build NLPSolver extension when enabled (fate#304653)
diff --git a/patches/dev300/vcl-fullscreenmode-fix.diff b/patches/dev300/vcl-fullscreenmode-fix.diff
index 079a8c8..c30054c 100644
--- a/patches/dev300/vcl-fullscreenmode-fix.diff
+++ b/patches/dev300/vcl-fullscreenmode-fix.diff
@@ -6,12 +6,12 @@ From: Thorsten Behrens <thb at openoffice.org>
 ---
 
  vcl/unx/gtk/window/gtkframe.cxx    |   13 +------------
- vcl/unx/source/window/salframe.cxx |   25 -------------------------
- 2 files changed, 1 insertions(+), 37 deletions(-)
+ vcl/unx/source/window/salframe.cxx |   26 --------------------------
+ 2 files changed, 1 insertions(+), 38 deletions(-)
 
 
 diff --git vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
-index 3cc1c44..3d0defa 100644
+index 75cd135..d4c9950 100644
 --- vcl/unx/gtk/window/gtkframe.cxx
 +++ vcl/unx/gtk/window/gtkframe.cxx
 @@ -842,12 +842,6 @@ void GtkSalFrame::Init( SalFrame* pParent, ULONG nStyle )
@@ -63,7 +63,7 @@ index 3cc1c44..3d0defa 100644
                  moveToScreen( nScreen );
                  Size aScreenSize = pDisp->GetScreenSize( m_nScreen ); 
 diff --git vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salframe.cxx
-index cc09809..95a19e1 100644
+index cc09809..9a017bb 100644
 --- vcl/unx/source/window/salframe.cxx
 +++ vcl/unx/source/window/salframe.cxx
 @@ -608,8 +608,6 @@ void X11SalFrame::Init( ULONG nSalFrameStyle, int nScreen, SystemParentData* pPa
@@ -89,10 +89,11 @@ index cc09809..95a19e1 100644
      bMapped_   = bVisible;
      bViewable_ = bVisible;
      setXEmbedInfo();
-@@ -2203,22 +2194,6 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
+@@ -2202,23 +2193,6 @@ void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen )
+             maGeometry.nHeight = aRect.GetHeight();
              mbMaximizedHorz = mbMaximizedVert = false;
              createNewWindow( None, m_nScreen );
-             GetDisplay()->getWMAdaptor()->enableAlwaysOnTop( this, true );
+-            GetDisplay()->getWMAdaptor()->enableAlwaysOnTop( this, true );
 -            #if 0
 -            // this would give additional intent to the window
 -            // manager to force the positioning of the window;