[openoffice.org/f13/master: 2/2] Resolves: rhbz#648475 Crash in scanner dialog

[Caolan McNamara]

commit c18dbb367bd848acc9b272099ee6ca43849eb9c7
Merge: e01d3ac b3a1dbe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 1 15:37:20 2010 +0000

    Resolves: rhbz#648475 Crash in scanner dialog

 ...-Don-t-record-undo-info-during-escher-con.patch |   45 +++++++++----------
 ....2.0.rh642996.vcl.skip-reserved-operators.patch |   28 ++++++++++++
 openoffice.org.spec                                |   16 ++++++-
 sdext.avoid-running-minimizer-twice.patch          |   18 ++++++++
 workspace.fwk120.patch                             |   30 +++++++++++++
 5 files changed, 110 insertions(+), 27 deletions(-)
---
diff --cc openoffice.org.spec
index 3a705dc,6a6c31a..5359fc0
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@@ -178,7 -178,9 +178,10 @@@ Patch107: openoffice.org-3.3.0.rh637738
  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
- Patch111: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
+ Patch111: sdext.avoid-running-minimizer-twice.patch
+ Patch112: workspace.fwk120.patch
+ Patch113: openoffice.org-3.2.0.rh642996.vcl.skip-reserved-operators.patch
++Patch114: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
  
  %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
  %define instdir %{_libdir}
@@@ -1787,7 -1789,9 +1790,10 @@@ cp -p %{SOURCE5} external/unowinreg/uno
  %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
- %patch111 -p1 -b .rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
+ %patch111 -p1 -b .sdext.avoid-running-minimizer-twice.patch
+ %patch112 -p1 -b .workspace.fwk120.patch
+ %patch113 -p1 -b .rh642996.vcl.skip-reserved-operators.patch
++%patch114 -p1 -b .rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
  
  %build
  echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@@ -4273,11 -4277,12 +4279,15 @@@ f
  %endif
  
  %changelog
 +* Mon Nov 01 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-12.35-UNBUILT
 +- Resolves: rhbz#648475 Crash in scanner dialog
 +
- * Thu Oct 21 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.34
+ * Tue Oct 26 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.34
  - Resolves: rhbz#636521 crash in undo in sc
+ - Resolves: rhbz#641637 [abrt] [presentation-minimizer] crash in
+   OptimizationStats::GetStatusValue (dtardon)
+ - make LD_PRELOAD of libsalalloc_malloc.so work again (dtardon)
+ - Resolves: rhbz#642996 [abrt] CffSubsetterContext::readDictOp (dtardon)
  
  * 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