rpms/openoffice.org/FC-5 openoffice.org-2.0.3.rh187919.gtkunderkde.patch, NONE, 1.1 openoffice.org.spec, 1.674, 1.675

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv24114

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.3.rh187919.gtkunderkde.patch 
Log Message:
add openoffice.org-2.0.3.rh187919.gtkunderkde.patch

openoffice.org-2.0.3.rh187919.gtkunderkde.patch:
 salnativewidgets-gtk.cxx |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-2.0.3.rh187919.gtkunderkde.patch ---
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.14
diff -u -p -u -r1.14 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -392,10 +393,15 @@ void GtkData::initNWF( void )
     pSVData->maNWFData.mbDockingAreaSeparateTB = true;
     
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
-        // KDE 3.3 invented a bug in the qt<->gtk theme engine
-        // that makes direct rendering impossible: they totally
-        // ignore the clip rectangle passed to the paint methods
-        GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+	{
+		if( g_type_from_name( "QtEngineStyle" ) )
+		{
+			// KDE 3.3 invented a bug in the qt<->gtk theme engine
+			// that makes direct rendering impossible: they totally
+			// ignore the clip rectangle passed to the paint methods
+			GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
+		}
+	}
     
     #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "GtkPlugin: using %s NWF\n",


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -r1.674 -r1.675
--- openoffice.org.spec	7 Jul 2006 14:51:32 -0000	1.674
+++ openoffice.org.spec	10 Jul 2006 12:48:55 -0000	1.675
@@ -179,6 +179,7 @@
 Patch51: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
 Patch52: openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch
 Patch53: openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
+Patch54: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -841,6 +842,7 @@
 %patch51 -p1 -b .cppuhelper.dangerousvisibility.patch
 %patch52 -p1 -b .ooo66510.shell.recentlyused.patch
 %patch53 -p1 -b .ooo64206.sfx2.saveas.patch
+%patch54 -p1 -b .rh187919.gtkunderkde.patch
 
 
 %if %{includingexternals}
@@ -3291,6 +3293,7 @@
 - rh#197618# add openoffice.org-2.0.1.ooo64206.sfx2.saveas.patch
 - add openoffice.org.2.0.3.ooo66510.shell.recentlyused.patch to make 
   ~/.recently-used safe
+- add openoffice.org-2.0.3.rh187919.gtkunderkde.patch
 
 * Fri Jun 30 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.16
 - CVE-2006-2198 macro security