[openoffice.org/f14/master] latest milestone

[Caolan McNamara]

commit f750e5cb27b3032055a2f9022ecae274770e1b44
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 22 08:46:30 2010 +0100

    latest milestone

 .gitignore                                         |    2 +-
 ...-Don-t-record-undo-info-during-escher-con.patch |   35 ++++++++++++++++++++
 openoffice.org.spec                                |    9 +++--
 sources                                            |    2 +-
 4 files changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49dbc6e..c9ea820 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 description.xml
 manifest.xml
-OOO330_m11.tar.bz2
+OOO330_m12.tar.bz2
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 a358379..f92ce2f 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
-%define ooomilestone 11
-%define rh_rpm_release 2
+%define ooomilestone 12
+%define rh_rpm_release 1
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -129,6 +129,7 @@ Patch43: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
 Patch44: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
 Patch45: LibO-backport-eapifix.patch
 Patch46: openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch
+Patch47: 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}
@@ -1663,6 +1664,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch44 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
 %patch45 -p1 -b .LibO-backport-eapifix.patch
 %patch46 -p1 -b .rh635918.vcl.fix-im-handling.patch
+%patch47 -p1 -b .rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3862,9 +3864,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Fri Oct 22 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-11.2
+* Fri Oct 21 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-12.1
 - Resolves: rhbz#635918 While inputting Hangul (Korean alphabet) with
   ibus, cursor does't move (dtardon)
+- Resolves: rhbz#636521 crash in undo in sc
 
 * Mon Oct 18 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-11.1
 - latest milestone
diff --git a/sources b/sources
index d0969c5..841234e 100644
--- a/sources
+++ b/sources
@@ -16,4 +16,4 @@ f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 5d4db996b3fe3169bb3cc6af22aec605  description.xml
 22be99cb6dbf147543154099d3db0dfa  manifest.xml
 0dd1d333fe555f9bec2ef4d623b69e7d  redhat-langpacks.tar.gz
-ae12a728d819e5eb93c64a69dd20ce4b  OOO330_m11.tar.bz2
+14ea1c43174104791ca9ec9ef4ff6f0c  OOO330_m12.tar.bz2