[openoffice.org/f13/master] Resolves: rhbz#636521 crash in undo in sc

[Caolan McNamara]

commit 3715e58bb72cd3ce7b0a5572bfc85340bafde0b7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 21 21:18:30 2010 +0100

    Resolves: rhbz#636521 crash in undo in sc

 ...-Don-t-record-undo-info-during-escher-con.patch |   35 ++++++++++++++++++++
 openoffice.org.spec                                |    7 +++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch b/0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
new file mode 100644
index 0000000..d09f365
--- /dev/null
+++ b/0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
@@ -0,0 +1,35 @@
+From 28ad1e7dcf70f390bd2fa3ff96eff847429aea08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 21 Oct 2010 21:07:51 +0100
+Subject: [PATCH] rhbz#636521 Don't record undo info during escher conversion
+
+---
+ sc/source/filter/excel/xiescher.cxx |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
+index 999927a..c9cc3ab 100644
+--- a/sc/source/filter/excel/xiescher.cxx
++++ b/sc/source/filter/excel/xiescher.cxx
+@@ -3837,6 +3837,10 @@ sal_Size XclImpDrawing::GetProgressSize() const
+ 
+ void XclImpDrawing::ImplConvertObjects( XclImpDffConverter& rDffConv, SdrModel& rSdrModel, SdrPage& rSdrPage )
+ {
++    //rhbz#636521, disable undo during conversion. faster, smaller and stops
++    //temp objects being inserted into the undo list
++    bool bOrigUndoStatus = rSdrModel.IsUndoEnabled();
++    rSdrModel.EnableUndo(false);
+     // register this drawing manager at the passed (global) DFF manager
+     rDffConv.InitializeDrawing( *this, rSdrModel, rSdrPage );
+     // process list of objects to be skipped
+@@ -3849,6 +3853,7 @@ void XclImpDrawing::ImplConvertObjects( XclImpDffConverter& rDffConv, SdrModel&
+     rDffConv.ProcessDrawing( maDffStrm );
+     // unregister this drawing manager at the passed (global) DFF manager
+     rDffConv.FinalizeDrawing();
++    rSdrModel.EnableUndo(bOrigUndoStatus);
+ }
+ 
+ // protected ------------------------------------------------------------------
+-- 
+1.7.3.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 53ed61b..ab4f8bb 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 33
+%define rh_rpm_release 34
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -177,6 +177,7 @@ Patch106: openoffice.org-3.2.0.ooo114409.sw.prevent-dangling-ptr-deref.patch
 Patch107: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
 Patch108: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
 Patch109: workspace.aw081.patch
+Patch110: 0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1784,6 +1785,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch107 -p0 -b .rh637738.libgcrypt.addmutex.patch
 %patch108 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
 %patch109 -p1 -b .workspace.aw081.patch
+%patch110 -p1 -b .rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4269,6 +4271,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct 21 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.34
+- Resolves: rhbz#636521 crash in undo in sc
+
 * Fri Oct 15 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.33
 - Resolves: rhbz#637838 Cropped pictures are displayed in entirety in
   handouts (dtardon)