[openoffice.org/f13/master] Resolves: rhbz#641637 [abrt] [presentation-minimizer] crash in OptimizationStats::GetStatusValue

[David Tardon]

commit ba3559fb419eed1fe6e627b75711eb96fc02c83b
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 25 09:16:23 2010 +0200

     Resolves: rhbz#641637 [abrt] [presentation-minimizer] crash in OptimizationStats::GetStatusValue

 openoffice.org.spec                       |    6 +++++-
 sdext.avoid-running-minimizer-twice.patch |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org.spec b/openoffice.org.spec
index ab4f8bb..4d86d16 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -178,6 +178,7 @@ 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
+Patch111: sdext.avoid-running-minimizer-twice.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1786,6 +1787,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %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 .sdext.avoid-running-minimizer-twice.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4271,8 +4273,10 @@ fi
 %endif
 
 %changelog
-* Thu Oct 21 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.2.0-12.34
+* Mon Oct 25 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)
 
 * 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
diff --git a/sdext.avoid-running-minimizer-twice.patch b/sdext.avoid-running-minimizer-twice.patch
new file mode 100644
index 0000000..0b38a0e
--- /dev/null
+++ b/sdext.avoid-running-minimizer-twice.patch
@@ -0,0 +1,18 @@
+# HG changeset patch
+# Parent 1dd4e9cca391cf44e8d304c404fd35a9554bdf8f
+avoid running pres. minimizer dlg twice
+
+diff -r 1dd4e9cca391 -r bea24bcad645 sdext/source/minimizer/pppoptimizerdialog.cxx
+--- a/sdext/source/minimizer/pppoptimizerdialog.cxx	Tue Aug 17 14:46:58 2010 +0200
++++ b/sdext/source/minimizer/pppoptimizerdialog.cxx	Mon Oct 25 07:24:26 2010 +0200
+@@ -143,6 +143,10 @@
+ 	{
+ 		if ( rURL.Path.compareToAscii( "execute" ) == 0 )
+ 		{
++            // Do not try to start the dialog more than once
++            if (mpOptimizerDialog)
++                return;
++
+ 			sal_Bool bDialogExecuted = sal_False;
+ 
+ 			try