diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-01 15:25:28 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-01 15:26:43 +0000 |
commit | a0e7135737dcd6621d04dc847c99f43695d19fae (patch) | |
tree | dd4b09180a4f919dcf079d07872a2f75f96dd166 | |
parent | adf7dc232d874a2670dea2dcd3805b8b2ddfdbe3 (diff) |
rhbz#648475# crash in scanner dialog, reset link in dtor
Notes
split repo tag: components_LIBREOFFICE_3_3_FREEZE
-rw-r--r-- | 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 a58ce6173a59..0ab5a1271b0f 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; |