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

[Caolan McNamara]

commit 8a6e290c277df52d89559e16f99ab9390ead6927
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 1 15:33:27 2010 +0000

    Resolves: rhbz#648475 Crash in scanner dialog

 ...-crash-in-scanner-dialog-reset-link-in-dt.patch |   52 ++++++++++++++++++++
 openoffice.org.spec                                |    7 ++-
 2 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch b/0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
new file mode 100644
index 0000000..0ba1976
--- /dev/null
+++ b/0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
@@ -0,0 +1,52 @@
+From 9d9e34a0c0704388b718619eea0c74e533e178d0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 1 Nov 2010 15:25:28 +0000
+Subject: [PATCH] rhbz#648475# crash in scanner dialog, reset link in dtor
+
+---
+ extensions/source/scanner/sanedlg.cxx |    9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
+index 759c5c8..159c8af 100644
+--- a/extensions/source/scanner/sanedlg.cxx
++++ b/extensions/source/scanner/sanedlg.cxx
+@@ -133,6 +133,7 @@ SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
+ 
+ SaneDlg::~SaneDlg()
+ {
++    mrSane.SetReloadOptionsHdl( maOldLink );
+ }
+ 
+ short SaneDlg::Execute()
+@@ -479,14 +480,12 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
+     {
+         double fRes = (double)maReslBox.GetValue();
+         SetAdjustedNumericalValue( "resolution", fRes );
+-        mrSane.SetReloadOptionsHdl( maOldLink );
+         UpdateScanArea( TRUE );
+         SaveState();
+         EndDialog( mrSane.IsOpen() ? 1 : 0 );
+     }
+     else if( pButton == &maCancelButton )
+     {
+-        mrSane.SetReloadOptionsHdl( maOldLink );
+         mrSane.Close();
+         EndDialog( 0 );
+     }
+@@ -689,9 +688,9 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
+ 
+ IMPL_LINK( SaneDlg, ReloadSaneOptionsHdl, Sane*, /*pSane*/ )
+ {
+-     mnCurrentOption = -1;
+-     mnCurrentElement = 0;
+-     DisableOption();
++    mnCurrentOption = -1;
++    mnCurrentElement = 0;
++    DisableOption();
+     // #92024# preserve preview rect, should only be set
+     // initially or in AcquirePreview
+     Rectangle aPreviewRect = maPreviewRect;
+-- 
+1.7.3.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index c33ccac..8ff6811 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 13
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -133,6 +133,7 @@ Patch47: 0001-rhbz-636521-Don-t-record-undo-info-during-escher-con.patch
 Patch48: openoffice.org-3.2.0.rh642996.vcl.skip-reserved-operators.patch
 Patch49: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
 Patch50: 0001-include-redland.h-instead-of-librdf.h.patch
+Patch51: 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}
@@ -1671,6 +1672,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch48 -p1 -b .rh642996.vcl.skip-reserved-operators.patch
 %patch49 -p1 -b .0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
 %patch50 -p1 -b .0001-include-redland.h-instead-of-librdf.h.patch
+%patch51 -p1 -b .0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3870,6 +3872,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Mon Nov 01 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-13.3
+- Resolves: rhbz#648475 Crash in scanner dialog
+
 * Fri Oct 29 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-13.2
 - Resolves: rhbz#642996 [abrt] CffSubsetterContext::readDictOp (dtardon)