rpms/openoffice.org/devel openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch, NONE, 1.1 openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch, NONE, 1.1 openoffice.org.spec, 1.1670, 1.1671 openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch, 1.1, NONE openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.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-serv9472

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch 
	openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch 
Removed Files:
	openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch 
	openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch 
Log Message:
issuezilla working again, upstream new patches

openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch:

--- NEW FILE openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch ---
diff -ru openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
--- openoffice.org.orig/vcl/unx/gtk.orig/gdi/salnativewidgets-gtk.cxx	2008-10-14 12:47:45.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-10-14 12:53:43.000000000 +0100
@@ -3652,7 +3652,7 @@
 {
 	if ( !gWidgetData[nScreen].gSpinButtonWidget )
 	{
-		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) );
+		GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 1, 1, 1, 0) );
 		gWidgetData[nScreen].gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 );
 
 		//Setting non-editable means it doesn't blink, so there's no timeouts

openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch:

--- NEW FILE openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch ---
diff -ru desktop/source/deployment/manager/dp_manager.cxx desktop/source/deployment/manager/dp_manager.cxx
--- openoffice.org.orig/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:04:24.000000000 +0100
+++ openoffice.org/desktop/source/deployment/manager/dp_manager.cxx	2008-10-14 16:06:25.000000000 +0100
@@ -1074,6 +1074,12 @@
             OSL_ENSURE( 0, ::rtl::OUStringToOString(
                             exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         }
+        catch (deployment::DeploymentException& exc) {
+            // ignore
+            (void) exc; // avoid warnings
+            OSL_ENSURE( 0, ::rtl::OUStringToOString(
+                            exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        }
     }
     return comphelper::containerToSequence(packages);
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1670
retrieving revision 1.1671
diff -u -r1.1670 -r1.1671
--- openoffice.org.spec	14 Oct 2008 15:22:43 -0000	1.1670
+++ openoffice.org.spec	15 Oct 2008 09:29:59 -0000	1.1671
@@ -116,8 +116,8 @@
 Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
 Patch46: workspace.vcl94.patch
 Patch47: workspace.vcl95.patch
-Patch48: openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch
-Patch49: openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch
+Patch48: openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch
+Patch49: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1319,8 +1319,8 @@
 %patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
 %patch46 -p1 -b .workspace.vcl94.patch
 %patch47 -p1 -b .workspace.vcl95.patch
-%patch48 -p1 -b .oooXXXXX.vcl.nogtkspinwarn.patch
-%patch49 -p1 -b .oooXXXXX.unopkg.handleexception.patch
+%patch48 -p1 -b .ooo94936.vcl.nogtkspinwarn.patch
+%patch49 -p1 -b .ooo94938.unopkg.handleexception.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3687,8 +3687,8 @@
 
 %changelog
 * Tue Oct 14 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.4
-- Resolves: rhbz#466605 openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch
-- Resolves: rhbz#466881 openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch
+- Resolves: rhbz#466605 openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch
+- Resolves: rhbz#466881 openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
 
 * Fri Oct 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.3
 - Resolves: rhbz#465664 need lucene for runtime help search


--- openoffice.org-3.0.0.oooXXXXX.unopkg.handleexception.patch DELETED ---


--- openoffice.org-3.0.0.oooXXXXX.vcl.nogtkspinwarn.patch DELETED ---