diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-03 15:27:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-04 20:27:00 +0100 |
| commit | 0a09ca614bcf07fadddeecb217f0c871f084810c (patch) | |
| tree | 90560942df3c9086032f3d7bbbde1683f34e3dbd /vcl/source/window | |
| parent | 26211f0456227ba7ec23143f8fa6de5c405a8229 (diff) | |
Related: tdf#113160 set parent of warning dialogs during load
to the new window frame being constructed that (may) contain
the progress bar, that way such modal dialogs affect the loading
document window and not whatever window happens to be active
Change-Id: I1c7d3185e47fa316eef003b80d18b31d341b79d6
Reviewed-on: https://gerrit.libreoffice.org/44269
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/errinf.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx index 40849ca916e1..00a99f420b01 100644 --- a/vcl/source/window/errinf.cxx +++ b/vcl/source/window/errinf.cxx @@ -108,13 +108,12 @@ bool ErrorHandler::GetErrorString(ErrCode nErrCodeId, OUString& rErrStr) return false; } -DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId, DialogMask nFlags) +DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId, vcl::Window *pParent, DialogMask nFlags) { if (nErrCodeId == ERRCODE_NONE || nErrCodeId == ERRCODE_ABORT) return DialogMask::NONE; ErrorRegistry &rData = TheErrorRegistry::get(); - vcl::Window *pParent = nullptr; ErrorInfo *pInfo = ErrorInfo::GetErrorInfo(nErrCodeId); OUString aAction; @@ -126,7 +125,7 @@ DialogMask ErrorHandler::HandleError(ErrCode nErrCodeId, DialogMask nFlags) { if(pCtx->GetParent()) { - pParent=pCtx->GetParent(); + pParent = pCtx->GetParent(); break; } } |