rpms/openoffice.org/devel openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch, NONE, 1.1 openoffice.org.spec, 1.1466, 1.1467

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Mon Apr 7 08:40:38 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch 
Log Message:
Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch

openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch:

--- NEW FILE openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.42
diff -u -r1.42 salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	12 Dec 2007 13:20:51 -0000	1.42
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	7 Apr 2008 08:35:48 -0000
@@ -3054,6 +3055,7 @@
     NWEnsureGTKMenubar( m_nScreen );
     NWEnsureGTKScrollbars( m_nScreen );
     NWEnsureGTKEditBox( m_nScreen );
+    NWEnsureGTKTooltip( m_nScreen );
     
     gtk_widget_ensure_style( m_pWindow );
     GtkStyle* pStyle = gtk_widget_get_style( m_pWindow );
@@ -3074,6 +3076,10 @@
     aStyleSet.SetInfoTextColor( aTextColor );
     aStyleSet.SetWindowTextColor( aTextColor );
     aStyleSet.SetFieldTextColor( aTextColor );
+
+    // Tooltip colors
+    GtkStyle* pTooltipStyle = gtk_widget_get_style( gWidgetData[m_nScreen].gTooltipPopup );
+    aTextColor = getColor( pTooltipStyle->fg[ GTK_STATE_NORMAL ] );
     aStyleSet.SetHelpTextColor( aTextColor );
     
     // mouse over text colors


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1466
retrieving revision 1.1467
diff -u -r1.1466 -r1.1467
--- openoffice.org.spec	4 Apr 2008 14:38:50 -0000	1.1466
+++ openoffice.org.spec	7 Apr 2008 08:39:27 -0000	1.1467
@@ -1,6 +1,6 @@
 %define oootag DEV300
 %define ooomilestone 5
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -138,6 +138,7 @@
 Patch65: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 Patch66: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch68: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1120,6 +1121,7 @@
 %patch65 -p1 -b .ooo87204.toolkit.64bitevent.patch
 %patch66 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 %patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch68 -p1 -b .ooo85691.vcl.tooltipcolor.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2868,6 +2870,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
+- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+
 * Fri Apr 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.2
 - reenable dicts
 




More information about the fedora-extras-commits mailing list