diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-09 12:39:35 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-08-12 09:55:48 +0200 |
| commit | fbcaaaab0603825b31c4679d4713c0b3530c5dec (patch) | |
| tree | 9cf437d978007d1a8335ee48ccf75419854dd99e /sfx2 | |
| parent | 4093811d1327e83edf216639d7b1173d8ebf7165 (diff) | |
Resolves: tdf#126790 use TopLevelWindowLocker in welded help path
Change-Id: I4340d021b63609189d3179a7bcff7fac4fcef69d
Reviewed-on: https://gerrit.libreoffice.org/77196
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 275b55172630..672308ecc2de 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -1263,8 +1263,11 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt SvtHelpOptions aHelpOptions; bool bShowOfflineHelpPopUp = aHelpOptions.IsOfflineHelpPopUp(); + TopLevelWindowLocker aBusy; + if(bShowOfflineHelpPopUp) { + aBusy.incBusy(pWidget); std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pWidget, "sfx/ui/helpmanual.ui")); std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("onlinehelpmanual")); std::unique_ptr<weld::CheckButton> m_xHideOfflineHelpCB(xBuilder->weld_check_button("hidedialog")); @@ -1275,6 +1278,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt short OnlineHelpBox = xQueryBox->run(); bShowOfflineHelpPopUp = OnlineHelpBox != RET_OK; aHelpOptions.SetOfflineHelpPopUp(!m_xHideOfflineHelpCB->get_state()); + aBusy.decBusy(); } if(!bShowOfflineHelpPopUp) { @@ -1282,8 +1286,10 @@ bool SfxHelp::Start_Impl(const OUString& rURL, weld::Widget* pWidget, const OUSt return true; else { + aBusy.incBusy(pWidget); NoHelpErrorBox aErrBox(pWidget); aErrBox.run(); + aBusy.decBusy(); return false; } } |