rpms/openoffice.org/devel openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch, NONE, 1.1 openoffice.org.spec, 1.1954, 1.1955 workspace.sb109.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch 
Removed Files:
	workspace.sb109.patch 
Log Message:
Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch

openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch:

--- NEW FILE openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch ---
diff -ru vcl.orig/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- vcl.orig/unx/gtk/window/gtkframe.cxx	2009-07-02 10:10:48.000000000 +0100
+++ vcl/unx/gtk/window/gtkframe.cxx	2009-07-02 10:13:01.000000000 +0100
@@ -824,7 +824,12 @@
         }
         if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ) )
         {
-            eType = GDK_WINDOW_TYPE_HINT_DOCK;
+	    //KWin apparently gets very confused with a DOCK hint on such a
+	    //full-screen window shown on one monitor of many
+            if (getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("KWin"))
+                eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
+            else
+                eType = GDK_WINDOW_TYPE_HINT_DOCK;
             gtk_window_set_keep_above( GTK_WINDOW(m_pWindow), true );
         }
         


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1954
retrieving revision 1.1955
diff -u -p -r1.1954 -r1.1955
--- openoffice.org.spec	30 Jun 2009 08:13:22 -0000	1.1954
+++ openoffice.org.spec	2 Jul 2009 12:19:00 -0000	1.1955
@@ -151,6 +151,7 @@ Patch73: openoffice.org-3.1.0.ooo102920.
 Patch74: workspace.aw073.patch
 Patch75: workspace.cmcfixes60.patch
 Patch76: openoffice.org-3.1.0.ooo92645.oox.msxmldecryptimpl.patch
+Patch77: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1659,6 +1660,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch74 -p0 -b .workspace.aw073.patch
 %patch75 -p0 -b .workspace.cmcfixes60.patch
 %patch76 -p0 -b .ooo92645.oox.msxmldecryptimpl.patch
+%patch77 -p0 -b .ooo103277.vcl.kwinworkaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4172,6 +4174,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-14.2
+- Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
+
 * Sun Jun 28 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-14.1
 - implement MSXML decryption, no querying for passwords though, so
   only currently opens "protected" .xlsx documents which are 


--- workspace.sb109.patch DELETED ---