On 07/30/2012 04:49 PM, Noel Power wrote:
On 30/07/12 11:04, Stephan Bergmann wrote:
<http://cgit.freedesktop.org/libreoffice/core/commit/?id=b5ad981518f4407243f89507b2561dd0b1ef28ee>
"bnc#524250: Show backing component after cancelled recovery"
@@ -1203,24 +1203,19 @@ sal_Bool impl_callRecoveryUI(sal_Bool
bEmergencySave ,
css::util::URL aURL;
if (bEmergencySave)
[...]
- return bRet;
+ return !bEmergencySave || bRet;
is that what you really want?, seems suspicious because if
bEmergencySave is passed in false ( which it is in the case of this patch )
- impl_callRecoveryUI(
+ bRecovery = impl_callRecoveryUI(
sal_False , // false => force recovery instead of emergency save
bCrashed ,
bExistsRecoveryData);
then impl_callRevoveryUI always going to return true
No, see the early "else return false;" in the middle of
impl_callRecoveryUI (desktop/source/app/app.cxx).
Stephan
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
