diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2005-03-30 07:32:29 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2005-03-30 07:32:29 +0000 |
commit | 93ff5ccb29d83531e9bedde411e17cffe865f7f3 (patch) | |
tree | 797910e914f2318f6aa5fdddfb9e7045a1427205 /svx/source/dialog/docrecovery.cxx | |
parent | INTEGRATION: CWS fwkfinal3 (1.17.4); FILE MERGED (diff) | |
download | core-93ff5ccb29d83531e9bedde411e17cffe865f7f3.tar.gz core-93ff5ccb29d83531e9bedde411e17cffe865f7f3.zip |
INTEGRATION: CWS fwkfinal3 (1.5.82); FILE MERGED
2005/03/18 12:57:15 as 1.5.82.1: #i43071# dont show cancel-querybox after recovery was finished, independing from the recovery state
Diffstat (limited to 'svx/source/dialog/docrecovery.cxx')
-rw-r--r-- | svx/source/dialog/docrecovery.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 5c091b18a4fd..b5de7d1f41b5 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docrecovery.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2005-02-21 14:35:12 $ + * last change: $Author: rt $ $Date: 2005-03-30 08:32:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1409,8 +1409,11 @@ IMPL_LINK( RecoveryDialog, NextButtonHdl, void*, EMPTYARG ) //=============================================== IMPL_LINK( RecoveryDialog, CancelButtonHdl, void*, EMPTYARG ) { - if (impl_askUserForWizardCancel(this, RID_SVXQB_EXIT_RECOVERY) == DLG_RET_CANCEL) - return 0; + if (m_eRecoveryState == RecoveryDialog::E_RECOVERY_PREPARED) + { + if (impl_askUserForWizardCancel(this, RID_SVXQB_EXIT_RECOVERY) == DLG_RET_CANCEL) + return 0; + } m_bUserDecideNext = sal_False; m_bWaitForUser = sal_False; return 0; |