rpms/openoffice.org/F-7 openoffice.org-2.3.0.ooo83169.colordialog.crash.patch, NONE, 1.1 openoffice.org.spec, 1.1199, 1.1200

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30714

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo83169.colordialog.crash.patch 
Log Message:
Resolves: rhbz#360461 fix openoffice.org-2.3.0.ooo83169.colordialog.crash.patch

openoffice.org-2.3.0.ooo83169.colordialog.crash.patch:

--- NEW FILE openoffice.org-2.3.0.ooo83169.colordialog.crash.patch ---
Index: source/dialog/tpcolor.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/tpcolor.cxx,v
retrieving revision 1.29
diff -u -r1.29 tpcolor.cxx
--- openoffice.org.orig/svx/source/dialog/tpcolor.cxx	27 Jun 2007 17:48:39 -0000	1.29
+++ openoffice.org/svx/source/dialog/tpcolor.cxx	31 Oct 2007 16:18:18 -0000
@@ -513,7 +513,7 @@
 		pWindow = pWindow->GetParent();
 	}
 
-	ResMgr rMgr = DIALOG_MGR();
+	ResMgr& rMgr = DIALOG_MGR();
 	String aDesc( ResId( RID_SVXSTR_DESC_COLOR, rMgr ) );
 	String aName( aEdtName.GetText() );
 	XColorEntry* pEntry;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1199
retrieving revision 1.1200
diff -u -r1.1199 -r1.1200
--- openoffice.org.spec	19 Oct 2007 11:42:15 -0000	1.1199
+++ openoffice.org.spec	31 Oct 2007 16:29:55 -0000	1.1200
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -133,6 +133,7 @@
 Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
 Patch67: openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch
 Patch68: openoffice.org.ooo82608.vcl.gtkbadfree.patch
+Patch69: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1064,6 +1065,7 @@
 %patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
 %patch67 -p1 -b .ooo82458.libtextcat.rpath.patch
 %patch68 -p1 -b .ooo82608.vcl.gtkbadfree.patch
+%patch69 -p1 -b .ooo83169.colordialog.crash.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2763,6 +2765,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Oct 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.5-unreleased
+- Resolves: rhbz#360461 openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
+
 * Thu Oct 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch