rpms/openoffice.org/devel openoffice.org-2.3.0.ooo83169.colordialog.crash.patch, NONE, 1.1 openoffice.org.spec, 1.1330, 1.1331

[Caolan McNamara (caolanm)]

Author: caolanm

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

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/devel/openoffice.org.spec,v
retrieving revision 1.1330
retrieving revision 1.1331
diff -u -r1.1330 -r1.1331
--- openoffice.org.spec	25 Oct 2007 09:47:14 -0000	1.1330
+++ openoffice.org.spec	31 Oct 2007 16:24:40 -0000	1.1331
@@ -151,6 +151,7 @@
 Patch69: openoffice.org.ooo82608.vcl.gtkbadfree.patch
 Patch70: openoffice.org-2.3.0.ooo76649.httpencoding.patch
 Patch71: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch72: openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1097,6 +1098,7 @@
 %patch69 -p1 -b .ooo82608.vcl.gtkbadfree.patch
 %patch70 -p1 -b .ooo76649.httpencoding.patc
 %patch71 -p1 -b .ooo82966.svx.missing3d.patch
+%patch72 -p1 -b .ooo83169.colordialog.crash.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2801,6 +2803,7 @@
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch
 - Resolves: rhbz#213213 openoffice.org-2.3.0.ooo76649.httpencoding.patch
 - add openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+- Resolves: rhbz#360461 fix openoffice.org-2.3.0.ooo83169.colordialog.crash.patch
 
 * Thu Oct 19 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.5
 - Resolves: rhbz#338701 fix openoffice.org.ooo82608.vcl.gtkbadfree.patch