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

[David Tardon]

commit fb621b5963b1de352fc9543a9bc494ef527864fe
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Oct 25 09:04:17 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 c17f1fe..7c38616 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -215,6 +215,7 @@ Patch136: workspace.gtkfpicker9.patch
 Patch137: openoffice.org-3.3.0.ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 Patch138: workspace.impress197.patch
 Patch139: openoffice.org-3.1.1.rhbz568277.avoid-crash-in-docx-import.patch
+Patch140: sdext.avoid-running-minimizer-twice.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1823,6 +1824,7 @@ cat %{PATCH11} >> svtools/source/dialogs/localize.sdf
 %patch137 -p1 -b .ooo112657.sw.rtf.dont-crash-on-merged-cells-without-clmgf.patch
 %patch138 -p1 -b .workspace.impress197.patch
 %patch139 -p1 -b .rhbz568277.avoid-crash-in-docx-import.patch
+%patch140 -p1 -b .sdext.avoid-running-minimizer-twice.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4368,8 +4370,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sat Aug 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.36-UNBUILT
+* Mon Oct 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.36-UNBUILT
 - Resolves: rhbz#568277 workaround to avoid the crash (dtardon)
+- Resolves: rhbz#641637 [abrt] [presentation-minimizer] crash in
+  OptimizationStats::GetStatusValue (dtardon)
 
 * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.35
 - Resolves: rhbz#623609 CVE-2010-2935 CVE-2010-2936
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