[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch, NONE, 1.1 openoffice.org.spec, 1.296, 1.297



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13953

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch 
Log Message:
band aid for now

openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch:
 dlgass.cxx |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch ---
Index: dlgass.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/dlg/dlgass.cxx,v
retrieving revision 1.33
diff -u -r1.33 dlgass.cxx
--- openoffice.org.orig/sd/dlgass.cxx	31 Mar 2005 13:21:16 -0000	1.33
+++ openoffice.org/sd/dlgass.cxx	12 Jul 2005 13:24:32 -0000
@@ -993,12 +993,22 @@
 	::vos::OGuard aGuard (Application::GetSolarMutex());
 
     // Copy the contents of the given template folders to a local list.
-    m_aPresentList.swap (rTemplateFolder);
+//    m_aPresentList.swap (rTemplateFolder);
+	std::vector<TemplateDir*>::iterator	I;
+    std::vector<TemplateDir*> aTemp;
+	for (I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++)
+		aTemp.push_back(*I);
+    m_aPresentList.clear();
+	for (I=rTemplateFolder.begin(); I!=rTemplateFolder.end(); I++)
+		m_aPresentList.push_back(*I);
+    rTemplateFolder.clear();
+	for (I=aTemp.begin(); I!=aTemp.end(); I++)
+		rTemplateFolder.push_back(*I);
+    aTemp.clear();
 
 	//	Fill in the list box on the first page.
 	int nFirstEntry = 0;
 	m_pPage1RegionLB->Clear();
-	std::vector<TemplateDir*>::iterator	I;
 	int	i;
 	for (i=0,I=m_aPresentList.begin(); I!=m_aPresentList.end(); I++,i++)
 	{


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- openoffice.org.spec	11 Jul 2005 15:33:17 -0000	1.296
+++ openoffice.org.spec	12 Jul 2005 13:32:27 -0000	1.297
@@ -1,5 +1,5 @@
 %define ooo2ver 116
-%define ooo_rpm_release 2.cmc3
+%define ooo_rpm_release 3
 %define build_fc4 0
 %define build_fc5 1
 
@@ -127,6 +127,7 @@
 Patch59: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
 Patch60: openoffice.org-1.9.116.rhXXXXX.desktop.noexpand.patch
 Patch61: workspace.impress63.patch
+Patch62: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -768,6 +769,7 @@
 %patch59 -p1 -b .oooXXXXX.extensions.evolution.patch
 %patch60 -p1 -b .rhXXXXX.desktop.noexpand.patch
 %patch61 -p1 -b .workspace.impress63.patch
+%patch62 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
 #libxmlsec/db4 then this needs to be modified/dropped
@@ -2949,11 +2951,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2.cmc3
+* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-3
 - enable evo addressbook in addressbook wizard
 - rh#162875# extra leading / from file picker
 - update fpicker stuff
 - add workspace.impress63.patch for rh#162158#
+- add openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch as a temporary
+  workaround until I figure out just what the hell is wrong
 
 * Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2
 - add openoffice.org-1.9.116.ooo51774.rsc.parallel.patch


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]