rpms/openoffice.org/F-10 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch, NONE, 1.1 openoffice.org.spec, 1.1702, 1.1703

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch 
Log Message:
Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch

openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch:

--- NEW FILE openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.47
diff -u -r1.47 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	16 Jun 2008 14:30:38 -0000	1.47
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	12 Dec 2008 11:14:39 -0000
@@ -405,6 +408,8 @@
     
     if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
     {
+        // Ensure that theme is instantiated to test for QtEngineStyle
+        GtkWidget *pThemeInstantiater = gtk_button_new();
         if( g_type_from_name( "QtEngineStyle" ) )
         {
             // KDE 3.3 invented a bug in the qt<->gtk theme engine
@@ -412,6 +417,7 @@
             // ignore the clip rectangle passed to the paint methods
             GtkSalGraphics::bNeedPixmapPaint = GtkSalGraphics::bGlobalNeedPixmapPaint = true;
         }
+        gtk_widget_destroy(pThemeInstantiater);
     }
     static const char* pEnv = getenv( "SAL_GTK_USE_PIXMAPPAINT" );
     if( pEnv && *pEnv )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -r1.1702 -r1.1703
--- openoffice.org.spec	11 Dec 2008 09:52:03 -0000	1.1702
+++ openoffice.org.spec	12 Dec 2008 11:22:01 -0000	1.1703
@@ -136,6 +136,7 @@
 Patch63: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
 Patch64: openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
 Patch65: workspace.vcl97.patch
+Patch66: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1396,6 +1397,7 @@
 %patch63 -p1
 %patch64 -p1 -b .ooo97064.fpicker.honour-uilang-override.patch
 %patch65 -p1 -b .workspace.vcl97.patch
+%patch66 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3762,7 +3764,7 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Fri Dec 12 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
 - Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
@@ -3779,6 +3781,7 @@
   openoffice.org-3.0.1.ooo97064.fpicker.honour-uilang-override.patch
 - Resolves: rhbz#475795 same fallbacks for printing as screen
   workspace.vcl97.patch
+- Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred