rpms/openoffice.org/F-11 workspace.vcl105.patch, NONE, 1.1 openoffice.org.spec, 1.1945, 1.1946

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29115/F-11

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl105.patch 
Log Message:
Resolves: rhbz#545783 add workspace.vcl105.patch

workspace.vcl105.patch:
 gtkframe.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE workspace.vcl105.patch ---
>From bd0d9d4ac9148211e14eb1548ad54829af465aed Mon Sep 17 00:00:00 2001
From: Chris Halls <halls at debian.org>
Date: Mon, 24 Aug 2009 16:44:15 +0100
Subject: [PATCH] Prevent multiple window resize calls when maximised

See http://bugs.debian.org/542387.

Problem introduced as part of fix to IZ#44325.

If KDE Window manager receives a window move after a window has already been
maximised, it assumes the window should be restored to original size. Under
Gnome it will stay maximised.

This fix disables further window resize calls once the window state has been
set to maximised.
---
 unx/gtk/window/gtkframe.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git vcl/unx/gtk/window/gtkframe.cxx b/unx/gtk/window/gtkframe.cxx
index c1fbbc5..d5e514a 100644
--- vcl.old/unx/gtk/window/gtkframe.cxx
+++ vcl/unx/gtk/window/gtkframe.cxx
@@ -1501,7 +1501,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, USHOR
 
         if( isChild( false, true ) )
             gtk_widget_set_size_request( m_pWindow, nWidth, nHeight );
-        else
+        else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) )
             gtk_window_resize( GTK_WINDOW(m_pWindow), nWidth, nHeight );
         setMinMaxSize();
 	}
@@ -1603,6 +1603,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState )
         SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH | SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT;
     
     if( (pState->mnMask & SAL_FRAMESTATE_MASK_STATE) &&
+        ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) &&
         (pState->mnState & SAL_FRAMESTATE_MAXIMIZED) &&
         (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask )
     {
-- 
1.6.3.3



Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1945
retrieving revision 1.1946
diff -u -p -r1.1945 -r1.1946
--- openoffice.org.spec	28 Nov 2009 17:58:12 -0000	1.1945
+++ openoffice.org.spec	9 Dec 2009 11:44:38 -0000	1.1946
@@ -163,6 +163,7 @@ Patch87: openoffice.org-3.2.0.ooo106523.
 Patch88: workspace.impress183.patch
 Patch89: openoffice.org-3.2.0.ooo107151.sc.pop-empty-cell.patch
 Patch90: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch91: workspace.vcl105.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1684,6 +1685,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch88 -p0 -b .workspace.impress183.patch
 %patch89 -p1 -b .ooo107151.sc.pop-empty-cell.patch
 %patch90 -p0 -b .ooo102645.fix.es.patch
+%patch91 -p0 -b .workspace.vcl105.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4187,10 +4189,11 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Nov 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
+* Wed Dec 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.9
 - add openoffice.org-4.2.0.ooo107151.sc.pop-empty-cell.patch (dtardon)
 - Resolves: rhbz#533538 OpenOffice keyboard shortcuts mis-map in the
   Spanish localized version of OOo (caolanm)
+- Resolves: rhbz#545783 add workspace.vcl105.patch (caolanm)
 
 * Tue Nov 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.8
 - Resolves: rhbz#533841 ooo#105710 svx loadstorenumbering (caolanm)