rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch, NONE, 1.1 openoffice.org.spec, 1.1921, 1.1922

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.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/F-11/openoffice.org.spec,v
retrieving revision 1.1921
retrieving revision 1.1922
diff -u -p -r1.1921 -r1.1922
--- openoffice.org.spec	22 Jun 2009 16:40:37 -0000	1.1921
+++ openoffice.org.spec	2 Jul 2009 12:18:59 -0000	1.1922
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 11
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -146,6 +146,7 @@ Patch70: workspace.pdfextfix02.patch
 Patch71: openoffice.org-3.1.0.ooo102920.i18npool.utf16bustage.patch
 Patch72: workspace.aw073.patch
 Patch73: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
+Patch74: 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}
@@ -1650,6 +1651,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch71 -p0 -b .ooo102920.i18npool.utf16bustage.patch
 %patch72 -p0 -b .workspace.aw073.patch
 %patch73 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
+%patch74 -p0 -b .ooo103277.vcl.kwinworkaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4152,6 +4154,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5.UNBUILT
+- Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
+
 * Fri Jun 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4
 - Related: rhbz#472853 openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
 - Resolves: rhbz#503003 silence warnings on updates