diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:51:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-05-08 13:51:13 +0000 |
| commit | c67c93627eeb53ef67855b2037a73049ba07dd50 (patch) | |
| tree | c8d7a9e4a563728802a0cbc27a3c0c759a6a2bb8 /svx/source/dialog/docrecovery.cxx | |
| parent | c256d1eaa935bcc7881b60237685a8d7c3abeb74 (diff) | |
INTEGRATION: CWS mbapp3 (1.10.280); FILE MERGED
2006/04/25 07:42:59 as 1.10.280.1: #i64599# remove checkbox, which can be used to disable automatic restart after crash
Diffstat (limited to 'svx/source/dialog/docrecovery.cxx')
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index d516187002de..4db21f18ac67 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docrecovery.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-11-11 12:48:50 $ + * last change: $Author: hr $ $Date: 2006-05-08 14:51:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -784,7 +784,6 @@ SaveDialog::SaveDialog(Window* pParent, , m_aDescrFT ( this , ResId ( FT_SAVE_DESCR ) ) , m_aFileListFT ( this , ResId ( FT_SAVE_FILELIST ) ) , m_aFileListLB ( this , ResId ( LB_SAVE_FILELIST ) ) - , m_aLaunchAutoCB( this , ResId ( CB_SAVE_LAUNCHAUTO ) ) , m_aBottomFL ( this , ResId ( FL_SAVE_BOTTOM ) ) , m_aOkBtn ( this , ResId ( BT_SAVE_OK ) ) , m_pCore ( pCore ) @@ -853,16 +852,10 @@ short SaveDialog::execute() m_nResult = pProgress->Execute(); delete pProgress; } - // if "CANCEL" => return "CANCEL" - // if "OK" => return OK or(!) OK_AUTOLUNCH, which depends from the AutpLunchCB ... - if ( - (m_nResult == DLG_RET_OK ) && - (m_aLaunchAutoCB.IsChecked()) - ) - { + // if "OK" => "AUTOLUNCH" always ! + if (m_nResult == DLG_RET_OK) m_nResult = DLG_RET_OK_AUTOLUNCH; - } return m_nResult; } |