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 /include/vcl/errinf.hxx | |
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 'include/vcl/errinf.hxx')
-rw-r--r-- | include/vcl/errinf.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 428a46eb72e4..4a3990b237ef 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -125,11 +125,12 @@ public: 4. Default ButtonsOk, MessageError @param nErrCodeId error id + @param pParent parent window the error dialog will be modal for. nullptr for unrecommended "pick default" @param nFlags error flags. @return what sort of dialog to use, with what buttons */ - static DialogMask HandleError(ErrCode nId, DialogMask nMask = DialogMask::MAX); + static DialogMask HandleError(ErrCode nId, vcl::Window* pParent = nullptr, DialogMask nMask = DialogMask::MAX); static bool GetErrorString(ErrCode nId, OUString& rStr); protected: |